| Message ID | 98491ec78ab671f5a14fce42d10f9745ebddb112.1702258360.git.daniel@makrotopia.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: mediatek: mt7986: silence error in case of -EPROBE_DEFER | expand |
Hi Daniel, On Mon, Dec 11, 2023 at 9:33 AM Daniel Golle <daniel@makrotopia.org> wrote: > > If probe is defered no error should be printed. Mute it. > > Signed-off-by: Daniel Golle <daniel@makrotopia.org> > --- > 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 > >
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 <daniel@makrotopia.org> > Reviewed-by: Maso Huang <maso.huang@mediatek.com> > --- > 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 >
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 <daniel@makrotopia.org> > --- > 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
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; }
If probe is defered no error should be printed. Mute it. Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- sound/soc/mediatek/mt7986/mt7986-wm8960.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)