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

[PATCH linux-next] ASoC: soc-topology: Switch to use dev_err_probe() helper

Posted by yang.guang5@zte.com.cn 1 year, 12 months ago

From: Yang Guang <yang.guang5@zte.com.cn>

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

Signed-off-by: Chen Haonan <chen.haonan2@zte.com.cn>
---
 sound/soc/soc-topology.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index ba4890991f0d..c0d40162aff2 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -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;
 	}

-- 
2.25.1

Re: [PATCH linux-next] ASoC: soc-topology: Switch to use dev_err_probe() helper

Posted by Christophe JAILLET 1 year, 12 months ago

Le 20/12/2023 à 03:57, yang.guang5@zte.com.cn a écrit :
> From: Yang Guang <yang.guang5@zte.com.cn>
> 
> dev_err() can be replace with dev_err_probe() which will
> check if error code is -EPROBE_DEFER.
> 
> Signed-off-by: Chen Haonan <chen.haonan2@zte.com.cn>
> ---
>   sound/soc/soc-topology.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
> index ba4890991f0d..c0d40162aff2 100644
> --- a/sound/soc/soc-topology.c
> +++ b/sound/soc/soc-topology.c
> @@ -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

Re: [PATCH linux-next] ASoC: soc-topology: Switch to use dev_err_probe() helper

Posted by Mark Brown 1 year, 12 months ago

On Wed, Dec 20, 2023 at 10:57:08AM +0800, yang.guang5@zte.com.cn wrote:
> From: Yang Guang <yang.guang5@zte.com.cn>
> 
> 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.