Skip to contentSkip to conversation

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

PATCH In review [email protected] 3 participants 3 messages Dec 20, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: soc-topology: Switch to use dev_err_probe() helper

From: Yang Guang <[email protected]>

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

---
 sound/soc/soc-topology.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/soc-topology.c +1 -2
index ba4890991f0d..c0d40162aff2 100644
@@ -1736,8 +1736,7 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg,
 
 	ret = snd_soc_add_pcm_runtimes(tplg->comp->card, link, 1);
 	if (ret < 0) {
-		if (ret != -EPROBE_DEFER)
-			dev_err(tplg->dev, "ASoC: adding FE link failed\n");
+		dev_err_probe(tplg->dev, ret, "ASoC: adding FE link failed\n");
 		goto err;
 	}
 
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 4 lines · On Wed, Dec 20, 2023 at 10:57:08AM +0800, [email protected] wrote:

From: Yang Guang <[email protected]>

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

This doesn't apply against current code, please check and resend.

#2 lore raw
In reply to [email protected]

Le 20/12/2023 à 03:57, [email protected] a écrit :

Quoted 15 lines

From: Yang Guang <[email protected]>

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

---
  sound/soc/soc-topology.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/soc-topology.c +0 -0
index ba4890991f0d..c0d40162aff2 100644

sound/soc/soc-topology.c static int soc_tplg_fe_link_create(struct soc_tplg *tplg, · line 1742

Quoted 9 lines
sound/soc/soc-topology.c +1 -2
@@ -1736,8 +1736,7 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg,
 
  	ret = snd_soc_add_pcm_runtimes(tplg->comp->card, link, 1);
  	if (ret < 0) {
-		if (ret != -EPROBE_DEFER)
-			dev_err(tplg->dev, "ASoC: adding FE link failed\n");
+		dev_err_probe(tplg->dev, ret, "ASoC: adding FE link failed\n");
  		goto err;
  	}
 

Hi,

apparently, err: is
err:

	return ret;
}

So, you could probably, directly use return dev_err_probe(...); and also save some { }.

CJ