Unverified Commit 34d3daba authored by Jon Hunter's avatar Jon Hunter Committed by Mark Brown
Browse files

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: default avatarJon Hunter <jonathanh@nvidia.com>
Link: https://lore.kernel.org/r/20201111103245.152189-1-jonathanh@nvidia.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0a142f53

sound/soc/tegra/tegra_alc5632.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE