ASoC: amd: Use dev_probe_err helper

Replace the pattern of check for err to match -EPROBE_DEFER and only
output errors to use the dev_err_probe helper instead.

Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Link: https://lore.kernel.org/r/20210722132731.13264-2-mario.limonciello@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c
index 84e3906abd4f33050b0adaf4535d06fcdffd2593..c130eeb07cdf582d7e1ccbc6f218c9bfc524b83c 100644 (file)
--- a/sound/soc/amd/acp-da7219-max98357a.c
+++ b/sound/soc/amd/acp-da7219-max98357a.c
@@ -746,15 +746,9 @@ static int cz_probe(struct platform_device *pdev)
        snd_soc_card_set_drvdata(card, machine);
        ret = devm_snd_soc_register_card(&pdev->dev, card);
        if (ret) {
-               if (ret != -EPROBE_DEFER)
-                       dev_err(&pdev->dev,
-                               "devm_snd_soc_register_card(%s) failed: %d\n",
-                               card->name, ret);
-               else
-                       dev_dbg(&pdev->dev,
-                               "devm_snd_soc_register_card(%s) probe deferred: %d\n",
-                               card->name, ret);
-               return ret;
+               return dev_err_probe(&pdev->dev, ret,
+                               "devm_snd_soc_register_card(%s) failed\n",
+                               card->name);
        }
        bt_uart_enable = !device_property_read_bool(&pdev->dev,
                                                    "bt-pad-enable");

diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c
index d9980aba29105f7e1371800b079c0dd03bdcd3ad..e561464f7d6034ec93b972a357cf73131bd4caad 100644 (file)
--- a/sound/soc/amd/acp3x-rt5682-max9836.c
+++ b/sound/soc/amd/acp3x-rt5682-max9836.c
@@ -512,17 +512,11 @@ static int acp3x_probe(struct platform_device *pdev)
 
        ret = devm_snd_soc_register_card(&pdev->dev, card);
        if (ret) {
-               if (ret != -EPROBE_DEFER)
-                       dev_err(&pdev->dev,
-                               "devm_snd_soc_register_card(%s) failed: %d\n",
-                               card->name, ret);
-               else
-                       dev_dbg(&pdev->dev,
-                               "devm_snd_soc_register_card(%s) probe deferred: %d\n",
-                               card->name, ret);
+               return dev_err_probe(&pdev->dev, ret,
+                               "devm_snd_soc_register_card(%s) failed\n",
+                               card->name);
        }
-
-       return ret;
+       return 0;
 }
 
 static const struct acpi_device_id acp3x_audio_acpi_match[] = {