Unverified Commit 1a1b3743 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Mark Brown
Browse files

ASoC: samsung: Silence warnings during deferred probe 



Don't confuse user with meaningless warning about the failure in getting
resources and registering card in case of deferred probe.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20200228101120.28819-1-m.szyprowski@samsung.com


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

sound/soc/samsung/arndale.c

+3 −1
Original line number Diff line number Diff line
@@ -174,7 +174,9 @@ static int arndale_audio_probe(struct platform_device *pdev) 


	ret = devm_snd_soc_register_card(card->dev, card);

	if (ret) {

		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);

		if (ret != -EPROBE_DEFER)

			dev_err(&pdev->dev,

				"snd_soc_register_card() failed: %d\n", ret);

		goto err_put_of_nodes;

	}

	return 0;

sound/soc/samsung/littlemill.c

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static int littlemill_probe(struct platform_device *pdev) 
	card->dev = &pdev->dev;



	ret = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret)

	if (ret && ret != -EPROBE_DEFER)

		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",

			ret);

sound/soc/samsung/lowland.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int lowland_probe(struct platform_device *pdev) 
	card->dev = &pdev->dev;



	ret = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret)

	if (ret && ret != -EPROBE_DEFER)

		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",

			ret);

sound/soc/samsung/odroid.c

+3 −1
Original line number Diff line number Diff line
@@ -311,7 +311,9 @@ static int odroid_audio_probe(struct platform_device *pdev) 


	ret = devm_snd_soc_register_card(dev, card);

	if (ret < 0) {

		dev_err(dev, "snd_soc_register_card() failed: %d\n", ret);

		if (ret != -EPROBE_DEFER)

			dev_err(dev, "snd_soc_register_card() failed: %d\n",

				ret);

		goto err_put_clk_i2s;

	}

sound/soc/samsung/smdk_wm8994.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static int smdk_audio_probe(struct platform_device *pdev) 


	ret = devm_snd_soc_register_card(&pdev->dev, card);



	if (ret)

	if (ret && ret != -EPROBE_DEFER)

		dev_err(&pdev->dev, "snd_soc_register_card() failed:%d\n", ret);



	return ret;