Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcd70eb5 authored by Sachin Kamat's avatar Sachin Kamat Committed by Mark Brown
Browse files

ASoC: mxs-saif: Use devm_snd_soc_register_component 



devm_snd_soc_register_component makes code simpler.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 256218ae

sound/soc/mxs/mxs-saif.c

+3 −9
Original line number Original line Diff line number Diff line
@@ -768,7 +768,7 @@ static int mxs_saif_probe(struct platform_device *pdev) 
			dev_warn(&pdev->dev, "failed to init clocks\n");

			dev_warn(&pdev->dev, "failed to init clocks\n");

	}

	}





	ret = snd_soc_register_component(&pdev->dev, &mxs_saif_component,

	ret = devm_snd_soc_register_component(&pdev->dev, &mxs_saif_component,

					      &mxs_saif_dai, 1);

					      &mxs_saif_dai, 1);

	if (ret) {

	if (ret) {

		dev_err(&pdev->dev, "register DAI failed\n");

		dev_err(&pdev->dev, "register DAI failed\n");
@@ -778,21 +778,15 @@ static int mxs_saif_probe(struct platform_device *pdev) 
	ret = mxs_pcm_platform_register(&pdev->dev);

	ret = mxs_pcm_platform_register(&pdev->dev);

	if (ret) {

	if (ret) {

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

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

		goto failed_pdev_alloc;

		return ret;

	}

	}





	return 0;

	return 0;



failed_pdev_alloc:

	snd_soc_unregister_component(&pdev->dev);



	return ret;

}

}





static int mxs_saif_remove(struct platform_device *pdev)

static int mxs_saif_remove(struct platform_device *pdev)

{

{

	mxs_pcm_platform_unregister(&pdev->dev);

	mxs_pcm_platform_unregister(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);





	return 0;

	return 0;

}

}