lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 205/452] ASoC: samsung: Use dev_err_probe() helper
    Date
    From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

    [ Upstream commit 27c6eaebcf75e4fac145d17c7fa76bc64b60d24c ]

    Use the dev_err_probe() helper, instead of open-coding the same
    operation.

    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    Link: https://lore.kernel.org/r/20211214020843.2225831-21-kuninori.morimoto.gx@renesas.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/samsung/aries_wm8994.c | 17 +++++++----------
    sound/soc/samsung/arndale.c | 5 ++---
    sound/soc/samsung/littlemill.c | 5 ++---
    sound/soc/samsung/lowland.c | 5 ++---
    sound/soc/samsung/odroid.c | 4 +---
    sound/soc/samsung/smdk_wm8994.c | 4 ++--
    sound/soc/samsung/smdk_wm8994pcm.c | 4 ++--
    sound/soc/samsung/snow.c | 9 +++------
    sound/soc/samsung/speyside.c | 5 ++---
    sound/soc/samsung/tm2_wm5110.c | 3 +--
    sound/soc/samsung/tobermory.c | 5 ++---
    11 files changed, 26 insertions(+), 40 deletions(-)

    diff --git a/sound/soc/samsung/aries_wm8994.c b/sound/soc/samsung/aries_wm8994.c
    index 0ac5956ba270..709336bbcc2f 100644
    --- a/sound/soc/samsung/aries_wm8994.c
    +++ b/sound/soc/samsung/aries_wm8994.c
    @@ -585,19 +585,16 @@ static int aries_audio_probe(struct platform_device *pdev)

    extcon_np = of_parse_phandle(np, "extcon", 0);
    priv->usb_extcon = extcon_find_edev_by_node(extcon_np);
    - if (IS_ERR(priv->usb_extcon)) {
    - if (PTR_ERR(priv->usb_extcon) != -EPROBE_DEFER)
    - dev_err(dev, "Failed to get extcon device");
    - return PTR_ERR(priv->usb_extcon);
    - }
    + if (IS_ERR(priv->usb_extcon))
    + return dev_err_probe(dev, PTR_ERR(priv->usb_extcon),
    + "Failed to get extcon device");
    of_node_put(extcon_np);

    priv->adc = devm_iio_channel_get(dev, "headset-detect");
    - if (IS_ERR(priv->adc)) {
    - if (PTR_ERR(priv->adc) != -EPROBE_DEFER)
    - dev_err(dev, "Failed to get ADC channel");
    - return PTR_ERR(priv->adc);
    - }
    + if (IS_ERR(priv->adc))
    + return dev_err_probe(dev, PTR_ERR(priv->adc),
    + "Failed to get ADC channel");
    +
    if (priv->adc->channel->type != IIO_VOLTAGE)
    return -EINVAL;

    diff --git a/sound/soc/samsung/arndale.c b/sound/soc/samsung/arndale.c
    index 28587375813a..35e34e534b8b 100644
    --- a/sound/soc/samsung/arndale.c
    +++ b/sound/soc/samsung/arndale.c
    @@ -174,9 +174,8 @@ static int arndale_audio_probe(struct platform_device *pdev)

    ret = devm_snd_soc_register_card(card->dev, card);
    if (ret) {
    - if (ret != -EPROBE_DEFER)
    - dev_err(&pdev->dev,
    - "snd_soc_register_card() failed: %d\n", ret);
    + dev_err_probe(&pdev->dev, ret,
    + "snd_soc_register_card() failed\n");
    goto err_put_of_nodes;
    }
    return 0;
    diff --git a/sound/soc/samsung/littlemill.c b/sound/soc/samsung/littlemill.c
    index a1ff1400857e..e73356a66087 100644
    --- a/sound/soc/samsung/littlemill.c
    +++ b/sound/soc/samsung/littlemill.c
    @@ -325,9 +325,8 @@ static int littlemill_probe(struct platform_device *pdev)
    card->dev = &pdev->dev;

    ret = devm_snd_soc_register_card(&pdev->dev, card);
    - if (ret && ret != -EPROBE_DEFER)
    - dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
    - ret);
    + if (ret)
    + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card() failed\n");

    return ret;
    }
    diff --git a/sound/soc/samsung/lowland.c b/sound/soc/samsung/lowland.c
    index 998d10cf8c94..7b12ccd2a9b2 100644
    --- a/sound/soc/samsung/lowland.c
    +++ b/sound/soc/samsung/lowland.c
    @@ -183,9 +183,8 @@ static int lowland_probe(struct platform_device *pdev)
    card->dev = &pdev->dev;

    ret = devm_snd_soc_register_card(&pdev->dev, card);
    - if (ret && ret != -EPROBE_DEFER)
    - dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
    - ret);
    + if (ret)
    + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card() failed\n");

    return ret;
    }
    diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c
    index ca643a488c3c..4ff12e2e704f 100644
    --- a/sound/soc/samsung/odroid.c
    +++ b/sound/soc/samsung/odroid.c
    @@ -311,9 +311,7 @@ static int odroid_audio_probe(struct platform_device *pdev)

    ret = devm_snd_soc_register_card(dev, card);
    if (ret < 0) {
    - if (ret != -EPROBE_DEFER)
    - dev_err(dev, "snd_soc_register_card() failed: %d\n",
    - ret);
    + dev_err_probe(dev, ret, "snd_soc_register_card() failed\n");
    goto err_put_clk_i2s;
    }

    diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c
    index 64a1a64656ab..92cd9e8a2e61 100644
    --- a/sound/soc/samsung/smdk_wm8994.c
    +++ b/sound/soc/samsung/smdk_wm8994.c
    @@ -178,8 +178,8 @@ static int smdk_audio_probe(struct platform_device *pdev)

    ret = devm_snd_soc_register_card(&pdev->dev, card);

    - if (ret && ret != -EPROBE_DEFER)
    - dev_err(&pdev->dev, "snd_soc_register_card() failed:%d\n", ret);
    + if (ret)
    + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card() failed\n");

    return ret;
    }
    diff --git a/sound/soc/samsung/smdk_wm8994pcm.c b/sound/soc/samsung/smdk_wm8994pcm.c
    index a01640576f71..110a51a4f870 100644
    --- a/sound/soc/samsung/smdk_wm8994pcm.c
    +++ b/sound/soc/samsung/smdk_wm8994pcm.c
    @@ -118,8 +118,8 @@ static int snd_smdk_probe(struct platform_device *pdev)

    smdk_pcm.dev = &pdev->dev;
    ret = devm_snd_soc_register_card(&pdev->dev, &smdk_pcm);
    - if (ret && ret != -EPROBE_DEFER)
    - dev_err(&pdev->dev, "snd_soc_register_card failed %d\n", ret);
    + if (ret)
    + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card failed\n");

    return ret;
    }
    diff --git a/sound/soc/samsung/snow.c b/sound/soc/samsung/snow.c
    index 07163f07c6d5..6aa2c66d8e8c 100644
    --- a/sound/soc/samsung/snow.c
    +++ b/sound/soc/samsung/snow.c
    @@ -215,12 +215,9 @@ static int snow_probe(struct platform_device *pdev)
    snd_soc_card_set_drvdata(card, priv);

    ret = devm_snd_soc_register_card(dev, card);
    - if (ret) {
    - if (ret != -EPROBE_DEFER)
    - dev_err(&pdev->dev,
    - "snd_soc_register_card failed (%d)\n", ret);
    - return ret;
    - }
    + if (ret)
    + return dev_err_probe(&pdev->dev, ret,
    + "snd_soc_register_card failed\n");

    return ret;
    }
    diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c
    index f5f6ba00d073..37b1f4f60b21 100644
    --- a/sound/soc/samsung/speyside.c
    +++ b/sound/soc/samsung/speyside.c
    @@ -330,9 +330,8 @@ static int speyside_probe(struct platform_device *pdev)
    card->dev = &pdev->dev;

    ret = devm_snd_soc_register_card(&pdev->dev, card);
    - if (ret && ret != -EPROBE_DEFER)
    - dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
    - ret);
    + if (ret)
    + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card() failed\n");

    return ret;
    }
    diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c
    index 125e07f65d2b..ca1be7a7cb8a 100644
    --- a/sound/soc/samsung/tm2_wm5110.c
    +++ b/sound/soc/samsung/tm2_wm5110.c
    @@ -611,8 +611,7 @@ static int tm2_probe(struct platform_device *pdev)

    ret = devm_snd_soc_register_card(dev, card);
    if (ret < 0) {
    - if (ret != -EPROBE_DEFER)
    - dev_err(dev, "Failed to register card: %d\n", ret);
    + dev_err_probe(dev, ret, "Failed to register card\n");
    goto dai_node_put;
    }

    diff --git a/sound/soc/samsung/tobermory.c b/sound/soc/samsung/tobermory.c
    index c962d2c2a7f7..95c6267b0c0c 100644
    --- a/sound/soc/samsung/tobermory.c
    +++ b/sound/soc/samsung/tobermory.c
    @@ -229,9 +229,8 @@ static int tobermory_probe(struct platform_device *pdev)
    card->dev = &pdev->dev;

    ret = devm_snd_soc_register_card(&pdev->dev, card);
    - if (ret && ret != -EPROBE_DEFER)
    - dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
    - ret);
    + if (ret)
    + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card() failed\n");

    return ret;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 19:47    [W:2.179 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site