ASoC: samsung: Use dev_err_probe() helper

[ 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>

diff --git a/sound/soc/samsung/aries_wm8994.c b/sound/soc/samsung/aries_wm8994.c
index 0ac5956ba270d7360109d3f9dd9086c3301dfc5c..709336bbcc2f08ed20559b1f18b2c4187cdf2e82 100644 (file)
--- 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 28587375813ac9a8cd4209b20ec6c74d86f363d8..35e34e534b8ba86d0a52a1ea28311830215d2d63 100644 (file)
--- 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 a1ff1400857ed715fcd973781bb83f5085f396dc..e73356a6608727c3dbefddac3b714fc261a1739e 100644 (file)
--- 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 998d10cf8c9476be8f23744a0bfe1703f024e37c..7b12ccd2a9b2220151e2e180ebee520224f17d29 100644 (file)
--- 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 ca643a488c3caa02154ad2382dc91a7d867c65c1..4ff12e2e704fecb10c6e4f6cec313c8b4da27319 100644 (file)
--- 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 64a1a64656abaf11304d4e4b1140cc968521a292..92cd9e8a2e617c15bc5062e8cdf1b8897d735011 100644 (file)
--- 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 a01640576f71d677618af9131b857f5fca741e1d..110a51a4f870af0424cce799aedc2e0fd24e4198 100644 (file)
--- 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 07163f07c6d561cb69a980584a5dd3e52963dc49..6aa2c66d8e8c92fb01316549a4c21f46c8a982e2 100644 (file)
--- 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 f5f6ba00d0731f07113f112478b99893b754f940..37b1f4f60b210f17d0782e585179559e237283bf 100644 (file)
--- 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 125e07f65d2b50ff74bfc94e719942772176e1be..ca1be7a7cb8abf1fb1a0c511d5757730e697f49a 100644 (file)
--- 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 c962d2c2a7f78941b7fa84519091032cfb4f46cc..95c6267b0c0cbcf38c36cdc5f1921ac5c212c21b 100644 (file)
--- 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;
 }