2023-12-11 01:33:48

by Daniel Golle

Subject: [PATCH] ASoC: mediatek: mt7986: silence error in case of -EPROBE_DEFER

If probe is defered no error should be printed. Mute it.

Signed-off-by: Daniel Golle <[email protected]>
---
sound/soc/mediatek/mt7986/mt7986-wm8960.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sound/soc/mediatek/mt7986/mt7986-wm8960.c b/sound/soc/mediatek/mt7986/mt7986-wm8960.c
index c1390b3734101..24a4b943030d7 100644
--- a/sound/soc/mediatek/mt7986/mt7986-wm8960.c
+++ b/sound/soc/mediatek/mt7986/mt7986-wm8960.c
@@ -144,7 +144,9 @@ static int mt7986_wm8960_machine_probe(struct platform_device *pdev)

ret = devm_snd_soc_register_card(&pdev->dev, card);
if (ret) {
- dev_err(&pdev->dev, "%s snd_soc_register_card fail: %d\n", __func__, ret);
+ if (ret != -EPROBE_DEFER)
+ dev_err(&pdev->dev, "%s snd_soc_register_card fail: %d\n", __func__, ret);
+
goto err_of_node_put;
}

--
2.43.0

2023-12-11 04:08:18

by Fei Shao

Subject: Re: [PATCH] ASoC: mediatek: mt7986: silence error in case of -EPROBE_DEFER

Hi Daniel,

On Mon, Dec 11, 2023 at 9:33 AM Daniel Golle <[email protected]> wrote:
>
> If probe is defered no error should be printed. Mute it.
>
> Signed-off-by: Daniel Golle <[email protected]>
> ---
> sound/soc/mediatek/mt7986/mt7986-wm8960.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/mediatek/mt7986/mt7986-wm8960.c b/sound/soc/mediatek/mt7986/mt7986-wm8960.c
> index c1390b3734101..24a4b943030d7 100644
> --- a/sound/soc/mediatek/mt7986/mt7986-wm8960.c
> +++ b/sound/soc/mediatek/mt7986/mt7986-wm8960.c
> @@ -144,7 +144,9 @@ static int mt7986_wm8960_machine_probe(struct platform_device *pdev)
>
> ret = devm_snd_soc_register_card(&pdev->dev, card);
> if (ret) {
> - dev_err(&pdev->dev, "%s snd_soc_register_card fail: %d\n", __func__, ret);
> + if (ret != -EPROBE_DEFER)
> + dev_err(&pdev->dev, "%s snd_soc_register_card fail: %d\n", __func__, ret);
> +
Please consider using dev_err_probe() instead.

Regards,
Fei

> goto err_of_node_put;
> }

>
> --
> 2.43.0
>
>

2023-12-11 04:08:49

by Maso Huang (黃加竹)

Subject: Re: [PATCH] ASoC: mediatek: mt7986: silence error in case of -EPROBE_DEFER

On Mon, 2023-12-11 at 01:33 +0000, Daniel Golle wrote:
>
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
> If probe is defered no error should be printed. Mute it.
>
> Signed-off-by: Daniel Golle <[email protected]>
>

Reviewed-by: Maso Huang <[email protected]>

> ---
> sound/soc/mediatek/mt7986/mt7986-wm8960.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/mediatek/mt7986/mt7986-wm8960.c
> b/sound/soc/mediatek/mt7986/mt7986-wm8960.c
> index c1390b3734101..24a4b943030d7 100644
> --- a/sound/soc/mediatek/mt7986/mt7986-wm8960.c
> +++ b/sound/soc/mediatek/mt7986/mt7986-wm8960.c
> @@ -144,7 +144,9 @@ static int mt7986_wm8960_machine_probe(struct
> platform_device *pdev)
>
> ret = devm_snd_soc_register_card(&pdev->dev, card);
> if (ret) {
> -dev_err(&pdev->dev, "%s snd_soc_register_card fail: %d\n", __func__,
> ret);
> +if (ret != -EPROBE_DEFER)
> +dev_err(&pdev->dev, "%s snd_soc_register_card fail: %d\n", __func__,
> ret);
> +
> goto err_of_node_put;
> }
>
> --
> 2.43.0
>

2023-12-11 09:58:55

by AngeloGioacchino Del Regno

Subject: Re: [PATCH] ASoC: mediatek: mt7986: silence error in case of -EPROBE_DEFER

Il 11/12/23 02:33, Daniel Golle ha scritto:
> If probe is defered no error should be printed. Mute it.
>
> Signed-off-by: Daniel Golle <[email protected]>
> ---
> sound/soc/mediatek/mt7986/mt7986-wm8960.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/mediatek/mt7986/mt7986-wm8960.c b/sound/soc/mediatek/mt7986/mt7986-wm8960.c
> index c1390b3734101..24a4b943030d7 100644
> --- a/sound/soc/mediatek/mt7986/mt7986-wm8960.c
> +++ b/sound/soc/mediatek/mt7986/mt7986-wm8960.c
> @@ -144,7 +144,9 @@ static int mt7986_wm8960_machine_probe(struct platform_device *pdev)
>
> ret = devm_snd_soc_register_card(&pdev->dev, card);
> if (ret) {
> - dev_err(&pdev->dev, "%s snd_soc_register_card fail: %d\n", __func__, ret);
> + if (ret != -EPROBE_DEFER)
> + dev_err(&pdev->dev, "%s snd_soc_register_card fail: %d\n", __func__, ret);

This is *exactly* what dev_err_probe() does! :-)

dev_err_probe(&pdev->dev, ret, "%s snd_soc_register_card fail: %d\n", __func__);

Regards,
Angelo