ASoC: tegra: Don't warn on probe deferral
Subsystems (3)
Jon Hunter
maintainerPATCH 1/1 ASoC: tegra: Don't warn on probe deferral
Deferred probe is an expected return value for snd_soc_register_card(). Given that the driver deals with it properly, there's no need to output a warning that may potentially confuse users.
--- sound/soc/tegra/tegra_alc5632.c | 4 ++-- sound/soc/tegra/tegra_max98090.c | 8 +++----- sound/soc/tegra/tegra_rt5640.c | 8 +++----- sound/soc/tegra/tegra_rt5677.c | 4 ++-- sound/soc/tegra/tegra_sgtl5000.c | 4 ++-- sound/soc/tegra/tegra_wm8753.c | 8 +++----- sound/soc/tegra/tegra_wm8903.c | 8 +++----- sound/soc/tegra/tegra_wm9712.c | 4 ++-- sound/soc/tegra/trimslice.c | 8 +++----- 9 files changed, 23 insertions(+), 33 deletions(-)
sound/soc/tegra/tegra_alc5632.c +2 -2
@@ -203,8 +203,8 @@ static int tegra_alc5632_probe(struct platform_device *pdev) ret =snd_soc_register_card (card);if (ret) { -dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , - ret); +dev_err_probe (&pdev->dev, ret, +"snd_soc_register_card failed\n" ); goto err_put_cpu_of_node; }
sound/soc/tegra/tegra_max98090.c +3 -5
@@ -247,11 +247,9 @@ static int tegra_max98090_probe(struct platform_device *pdev)return ret; ret =devm_snd_soc_register_card (&pdev->dev, card); -if (ret) { -dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , - ret); -return ret; - } +if (ret) +return dev_err_probe (&pdev->dev, ret, +"snd_soc_register_card failed\n" );return 0 ; }
sound/soc/tegra/tegra_rt5640.c +3 -5
@@ -193,11 +193,9 @@ static int tegra_rt5640_probe(struct platform_device *pdev)return ret; ret =devm_snd_soc_register_card (&pdev->dev, card); -if (ret) { -dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , - ret); -return ret; - } +if (ret) +return dev_err_probe (&pdev->dev, ret, +"snd_soc_register_card failed\n" );return 0 ; }
sound/soc/tegra/tegra_rt5677.c +2 -2
@@ -268,8 +268,8 @@ static int tegra_rt5677_probe(struct platform_device *pdev) ret =snd_soc_register_card (card);if (ret) { -dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , - ret); +dev_err_probe (&pdev->dev, ret, +"snd_soc_register_card failed\n" ); goto err_put_cpu_of_node; }
sound/soc/tegra/tegra_sgtl5000.c +2 -2
@@ -154,8 +154,8 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev) ret =snd_soc_register_card (card);if (ret) { -dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , - ret); +dev_err_probe (&pdev->dev, ret, +"snd_soc_register_card failed\n" ); goto err_put_cpu_of_node; }
sound/soc/tegra/tegra_wm8753.c +3 -5
@@ -156,11 +156,9 @@ static int tegra_wm8753_driver_probe(struct platform_device *pdev)return ret; ret =devm_snd_soc_register_card (&pdev->dev, card); -if (ret) { -dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , - ret); -return ret; - } +if (ret) +return dev_err_probe (&pdev->dev, ret, +"snd_soc_register_card failed\n" );return 0 ; }
sound/soc/tegra/tegra_wm8903.c +3 -5
@@ -352,11 +352,9 @@ static int tegra_wm8903_driver_probe(struct platform_device *pdev)return ret; ret =devm_snd_soc_register_card (&pdev->dev, card); -if (ret) { -dev_err (&pdev->dev,"devm_snd_soc_register_card failed (%d)\n" , - ret); -return ret; - } +if (ret) +return dev_err_probe (&pdev->dev, ret, +"snd_soc_register_card failed\n" );return 0 ; }
sound/soc/tegra/tegra_wm9712.c +2 -2
@@ -117,8 +117,8 @@ static int tegra_wm9712_driver_probe(struct platform_device *pdev) ret =snd_soc_register_card (card);if (ret) { -dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , - ret); +dev_err_probe (&pdev->dev, ret, +"snd_soc_register_card failed\n" ); goto codec_unregister; }
sound/soc/tegra/trimslice.c +3 -5
@@ -144,11 +144,9 @@ static int tegra_snd_trimslice_probe(struct platform_device *pdev)return ret; ret =devm_snd_soc_register_card (&pdev->dev, card); -if (ret) { -dev_err (&pdev->dev,"snd_soc_register_card failed (%d)\n" , - ret); -return ret; - } +if (ret) +return dev_err_probe (&pdev->dev, ret, +"snd_soc_register_card failed\n" );return 0 ; }
Signature · 1 line
2.25.1
Mark Brown
maintainerQuoted 3 lines · Jon Hunter
Deferred probe is an expected return value for
snd_soc_register_card(). Given that the driver deals with it properly, there's no need to output a warning that may potentially confuse users.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: tegra: Don't warn on probe deferral
commit: 34d3daba23399440dedddd0f9ccd6c1057314139
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