2022-09-11 15:33:11

by Mikhail Rudenko

[permalink] [raw]
Subject: [PATCH 1/2] ASoC: sunxi: sun4i-codec: silence misleading error in probe

In the case when a codec device is probed before codec analog
controls, snd_soc_register_card() returns -EPROBE_DEFER, resulting in
a misleading error message

sun4i-codec 1c22c00.codec: Failed to register our card

even if the device is probed successfully later. Use dev_err_probe()
to demote the above error to a debug message.

Signed-off-by: Mikhail Rudenko <[email protected]>
---
sound/soc/sunxi/sun4i-codec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 60712f24ade5..01b461c64d68 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -1825,7 +1825,7 @@ static int sun4i_codec_probe(struct platform_device *pdev)

ret = snd_soc_register_card(card);
if (ret) {
- dev_err(&pdev->dev, "Failed to register our card\n");
+ dev_err_probe(&pdev->dev, ret, "Failed to register our card\n");
goto err_assert_reset;
}

--
2.37.3


2022-09-12 16:22:53

by Jernej Škrabec

[permalink] [raw]
Subject: Re: [PATCH 1/2] ASoC: sunxi: sun4i-codec: silence misleading error in probe

Dne nedelja, 11. september 2022 ob 16:57:11 CEST je Mikhail Rudenko
napisal(a):
> In the case when a codec device is probed before codec analog
> controls, snd_soc_register_card() returns -EPROBE_DEFER, resulting in
> a misleading error message
>
> sun4i-codec 1c22c00.codec: Failed to register our card
>
> even if the device is probed successfully later. Use dev_err_probe()
> to demote the above error to a debug message.
>
> Signed-off-by: Mikhail Rudenko <[email protected]>

Acked-by: Jernej Skrabec <[email protected]>

Best regards,
Jernej

> ---
> sound/soc/sunxi/sun4i-codec.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
> index 60712f24ade5..01b461c64d68 100644
> --- a/sound/soc/sunxi/sun4i-codec.c
> +++ b/sound/soc/sunxi/sun4i-codec.c
> @@ -1825,7 +1825,7 @@ static int sun4i_codec_probe(struct platform_device
> *pdev)
>
> ret = snd_soc_register_card(card);
> if (ret) {
> - dev_err(&pdev->dev, "Failed to register our card\n");
> + dev_err_probe(&pdev->dev, ret, "Failed to register our
card\n");
> goto err_assert_reset;
> }




2022-09-14 10:02:58

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH 1/2] ASoC: sunxi: sun4i-codec: silence misleading error in probe

On Sun, 11 Sep 2022 17:57:11 +0300, Mikhail Rudenko wrote:
> In the case when a codec device is probed before codec analog
> controls, snd_soc_register_card() returns -EPROBE_DEFER, resulting in
> a misleading error message
>
> sun4i-codec 1c22c00.codec: Failed to register our card
>
> even if the device is probed successfully later. Use dev_err_probe()
> to demote the above error to a debug message.
>
> [...]

Applied to

broonie/sound.git for-next

Thanks!

[1/2] ASoC: sunxi: sun4i-codec: silence misleading error in probe
commit: 30248f618d30cf1ad9d5a72126799f2f0239860c
[2/2] ASoC: sunxi: sun4i-codec: set debugfs_prefix for CPU DAI component
(no commit info)

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark