From: Yang Yingliang <yangyingliang@huawei.com>
Date: Wed, 14 Sep 2022 13:33:55 +0000 (+0800)
Subject: ASoC: soc-dapm: Switch to use dev_err_probe() helper
X-Git-Tag: v6.1-rc1~158^2^2~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6b0be65123e1dfbcce6653a82394f989d3372ff;p=thirdparty%2Fkernel%2Flinux.git

ASoC: soc-dapm: Switch to use dev_err_probe() helper

dev_err() can be replace with dev_err_probe() which will check if error
code is -EPROBE_DEFER.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20220914133355.3779364-3-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 47a7bf99472ec..2d105bfee3871 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3764,9 +3764,8 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,
 	return w;
 
 request_failed:
-	if (ret != -EPROBE_DEFER)
-		dev_err(dapm->dev, "ASoC: Failed to request %s: %d\n",
-			w->name, ret);
+	dev_err_probe(dapm->dev, ret, "ASoC: Failed to request %s\n",
+		      w->name);
 	kfree_const(w->name);
 name_failed:
 	kfree_const(w->sname);