ASoC: samsung: Silence warnings during deferred probe

Don't confuse user with meaningless warning about the failure in getting
resources and registering card in case of deferred probe.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20200228101120.28819-1-m.szyprowski@samsung.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/samsung/arndale.c b/sound/soc/samsung/arndale.c
index d64602950cbdf3eb892788c59d044e06aec7bd76..6e6d67d6e0ab4c9f14fab88606e6c813d6ef13f2 100644 (file)
--- a/sound/soc/samsung/arndale.c
+++ b/sound/soc/samsung/arndale.c
@@ -174,7 +174,9 @@ static int arndale_audio_probe(struct platform_device *pdev)
 
        ret = devm_snd_soc_register_card(card->dev, card);
        if (ret) {
-               dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
+               if (ret != -EPROBE_DEFER)
+                       dev_err(&pdev->dev,
+                               "snd_soc_register_card() failed: %d\n", ret);
                goto err_put_of_nodes;
        }
        return 0;

diff --git a/sound/soc/samsung/littlemill.c b/sound/soc/samsung/littlemill.c
index 59904f44118b9d48495c6506690c7d03324b06c4..2f2f83a8c23a35ed2f6215fdc0e522ef3707cd43 100644 (file)
--- a/sound/soc/samsung/littlemill.c
+++ b/sound/soc/samsung/littlemill.c
@@ -325,7 +325,7 @@ static int littlemill_probe(struct platform_device *pdev)
        card->dev = &pdev->dev;
 
        ret = devm_snd_soc_register_card(&pdev->dev, card);
-       if (ret)
+       if (ret && ret != -EPROBE_DEFER)
                dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
                        ret);
 

diff --git a/sound/soc/samsung/lowland.c b/sound/soc/samsung/lowland.c
index 098eefc764dbaa9fd3b3c7a166e07428ab4e2791..fcc7897ee7d05e9fa4fac9334377e7fac8a19306 100644 (file)
--- a/sound/soc/samsung/lowland.c
+++ b/sound/soc/samsung/lowland.c
@@ -183,7 +183,7 @@ static int lowland_probe(struct platform_device *pdev)
        card->dev = &pdev->dev;
 
        ret = devm_snd_soc_register_card(&pdev->dev, card);
-       if (ret)
+       if (ret && ret != -EPROBE_DEFER)
                dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
                        ret);
 

diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c
index f0f5fa9c27d32a464e85a6aebd7fa3b8ad79bfb9..30c7e1bc2a30b2d46ca836318f1eed2c629fd1e2 100644 (file)
--- a/sound/soc/samsung/odroid.c
+++ b/sound/soc/samsung/odroid.c
@@ -311,7 +311,9 @@ static int odroid_audio_probe(struct platform_device *pdev)
 
        ret = devm_snd_soc_register_card(dev, card);
        if (ret < 0) {
-               dev_err(dev, "snd_soc_register_card() failed: %d\n", ret);
+               if (ret != -EPROBE_DEFER)
+                       dev_err(dev, "snd_soc_register_card() failed: %d\n",
+                               ret);
                goto err_put_clk_i2s;
        }
 

diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c
index 28f8be000aa1dc644c27eb85a32d2cc122236ce6..8fa5f6b387adcf34bd419afe2589b7cdbbdd6b6f 100644 (file)
--- a/sound/soc/samsung/smdk_wm8994.c
+++ b/sound/soc/samsung/smdk_wm8994.c
@@ -178,7 +178,7 @@ static int smdk_audio_probe(struct platform_device *pdev)
 
        ret = devm_snd_soc_register_card(&pdev->dev, card);
 
-       if (ret)
+       if (ret && ret != -EPROBE_DEFER)
                dev_err(&pdev->dev, "snd_soc_register_card() failed:%d\n", ret);
 
        return ret;

diff --git a/sound/soc/samsung/smdk_wm8994pcm.c b/sound/soc/samsung/smdk_wm8994pcm.c
index 2e3dc7320c62e99a1656b9c5e6d5bde252819fc1..6e44f7927852e3bef9e2de462a5853f1fdf5a106 100644 (file)
--- a/sound/soc/samsung/smdk_wm8994pcm.c
+++ b/sound/soc/samsung/smdk_wm8994pcm.c
@@ -118,7 +118,7 @@ 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)
+       if (ret && ret != -EPROBE_DEFER)
                dev_err(&pdev->dev, "snd_soc_register_card failed %d\n", ret);
 
        return ret;

diff --git a/sound/soc/samsung/snow.c b/sound/soc/samsung/snow.c
index f075aae9561a702538e5f0e161161f8ed8c6cf89..bebcf0a4d608e7fc484dc3ed9aedf3b9b1a4542b 100644 (file)
--- a/sound/soc/samsung/snow.c
+++ b/sound/soc/samsung/snow.c
@@ -216,7 +216,9 @@ static int snow_probe(struct platform_device *pdev)
 
        ret = devm_snd_soc_register_card(dev, card);
        if (ret) {
-               dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
+               if (ret != -EPROBE_DEFER)
+                       dev_err(&pdev->dev,
+                               "snd_soc_register_card failed (%d)\n", ret);
                return ret;
        }
 

diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c
index ea0d1ec67f0101fc565c60d3b4c36d4e053d022d..8f175f204eb70a5c99d6180d8a5bbb38200325c5 100644 (file)
--- a/sound/soc/samsung/speyside.c
+++ b/sound/soc/samsung/speyside.c
@@ -330,7 +330,7 @@ static int speyside_probe(struct platform_device *pdev)
        card->dev = &pdev->dev;
 
        ret = devm_snd_soc_register_card(&pdev->dev, card);
-       if (ret)
+       if (ret && ret != -EPROBE_DEFER)
                dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
                        ret);
 

diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c
index 10ff14b856f2366f38f3137f4803cbf19a606c7c..043a287728b36b66f957616d83c7c9c26bf98e7f 100644 (file)
--- a/sound/soc/samsung/tm2_wm5110.c
+++ b/sound/soc/samsung/tm2_wm5110.c
@@ -611,7 +611,8 @@ static int tm2_probe(struct platform_device *pdev)
 
        ret = devm_snd_soc_register_card(dev, card);
        if (ret < 0) {
-               dev_err(dev, "Failed to register card: %d\n", ret);
+               if (ret != -EPROBE_DEFER)
+                       dev_err(dev, "Failed to register card: %d\n", ret);
                goto dai_node_put;
        }
 

diff --git a/sound/soc/samsung/tobermory.c b/sound/soc/samsung/tobermory.c
index fdce28cc26c4155d5c2bb629b10a59ed17ea30be..1aa3fdb4b15218f0fd6d8ca286d5ce350baf382c 100644 (file)
--- a/sound/soc/samsung/tobermory.c
+++ b/sound/soc/samsung/tobermory.c
@@ -229,7 +229,7 @@ static int tobermory_probe(struct platform_device *pdev)
        card->dev = &pdev->dev;
 
        ret = devm_snd_soc_register_card(&pdev->dev, card);
-       if (ret)
+       if (ret && ret != -EPROBE_DEFER)
                dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
                        ret);