forked from Minki/linux
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. Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Link: https://lore.kernel.org/r/20201111103245.152189-1-jonathanh@nvidia.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
0a142f5367
commit
34d3daba23
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user