Unverified Commit 2e6f557c authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: fsl: Use dev_err_probe() helper 



Use the dev_err_probe() helper, instead of open-coding the same
operation.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/20211214020843.2225831-14-kuninori.morimoto.gx@renesas.com


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

sound/soc/fsl/fsl-asoc-card.c

+1 −2
Original line number Diff line number Diff line
@@ -853,8 +853,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 


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

	if (ret) {

		if (ret != -EPROBE_DEFER)

			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 asrc_fail;

	}

sound/soc/fsl/imx-card.c

+6 −11
Original line number Diff line number Diff line
@@ -563,9 +563,8 @@ static int imx_card_parse_of(struct imx_card_data *data) 


		ret = snd_soc_of_get_dai_name(cpu, &link->cpus->dai_name);

		if (ret) {

			if (ret != -EPROBE_DEFER)

				dev_err(card->dev, "%s: error getting cpu dai name: %d\n",

					link->name, ret);

			dev_err_probe(card->dev, ret,

				      "%s: error getting cpu dai name\n", link->name);

			goto err;

		}
@@ -573,9 +572,8 @@ static int imx_card_parse_of(struct imx_card_data *data) 
		if (codec) {

			ret = snd_soc_of_get_dai_link_codecs(dev, codec, link);

			if (ret < 0) {

				if (ret != -EPROBE_DEFER)

					dev_err(dev, "%s: codec dai not found: %d\n",

						link->name, ret);

				dev_err_probe(dev, ret, "%s: codec dai not found\n",

						link->name);

				goto err;

			}
@@ -814,11 +812,8 @@ static int imx_card_probe(struct platform_device *pdev) 
	}



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

	if (ret) {

		if (ret != -EPROBE_DEFER)

			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/fsl/imx-sgtl5000.c

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


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

	if (ret) {

		if (ret != -EPROBE_DEFER)

			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 fail;

	}

sound/soc/fsl/imx-spdif.c

+2 −2
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ static int imx_spdif_audio_probe(struct platform_device *pdev) 
		goto end;



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

	if (ret && ret != -EPROBE_DEFER)

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

	if (ret)

		dev_err_probe(&pdev->dev, ret, "snd_soc_register_card failed\n");



end:

	of_node_put(spdif_np);