ASoC: samsung: Use dev_err_probe() helper

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>

diff --git a/sound/soc/samsung/aries_wm8994.c b/sound/soc/samsung/aries_wm8994.c
index 313ab650f8d9f2d3243dc20d00e2412bd2fcf9d5..5265e546b124c9fea7e131efa2f523922e67359b 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 606ac5e33a8e9f32728467cf02c54077efee501d..a5dc640d0d768b0250ad6799f424ef4708bbc1fe 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 390f2dd735ad26eecb7274a49e8380d28cee58bc..34067cc314ff0c7baddd0ddeb7a1bf55f3660c6b 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 7661b637946d1e22952a5152bd8865e0d05bc365..821ad1eb1b79fa6a3268f20e30e3a9b3f7816922 100644 (file)
--- a/sound/soc/samsung/smdk_wm8994.c
+++ b/sound/soc/samsung/smdk_wm8994.c
@@ -179,8 +179,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 029448f5bedbe8bd53b871d0e1cb284e0d83ac35..d77dc54cae9c88ac81f100137a41a7471be5b384 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 6da674e901caf0bb345c505137b3f8400e321338..02372109c251ec02092b811ab9d4358cf21b9f86 100644 (file)
--- a/sound/soc/samsung/snow.c
+++ b/sound/soc/samsung/snow.c
@@ -212,12 +212,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 a2c77e6defec5fdbad132ff5a9c81d1450aa0fa1..d611ec9e5325e6a1eebe032eba1d16fe9403d5f8 100644 (file)
--- a/sound/soc/samsung/tm2_wm5110.c
+++ b/sound/soc/samsung/tm2_wm5110.c
@@ -612,8 +612,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 15223d860cb725e0fe8fb4da7424dbbf0faa194b..8d3149a47a4c84f3d30666e2e8d9963b38c390b7 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;
 }