diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-09-17 10:13:49 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-19 14:57:37 +0100 |
| commit | 256218ae65d2e59ef5d257355791a62af7d31b3c (patch) | |
| tree | a031eb75e13aa57f55c46e098c7ad6ab9b685b38 | |
| parent | 67a48b8181b0c981c59acf06f056e00184d3debd (diff) | |
| download | lwn-256218ae65d2e59ef5d257355791a62af7d31b3c.tar.gz lwn-256218ae65d2e59ef5d257355791a62af7d31b3c.zip | |
ASoC: fsl_spdif: Use devm_snd_soc_register_component
devm_snd_soc_register_component makes code simpler.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | sound/soc/fsl/fsl_spdif.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index 3920c3e849ce..44378e6e2696 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -1172,23 +1172,16 @@ static int fsl_spdif_probe(struct platform_device *pdev) /* Register with ASoC */ dev_set_drvdata(&pdev->dev, spdif_priv); - ret = snd_soc_register_component(&pdev->dev, &fsl_spdif_component, - &spdif_priv->cpu_dai_drv, 1); + ret = devm_snd_soc_register_component(&pdev->dev, &fsl_spdif_component, + &spdif_priv->cpu_dai_drv, 1); if (ret) { dev_err(&pdev->dev, "failed to register DAI: %d\n", ret); return ret; } ret = imx_pcm_dma_init(pdev); - if (ret) { + if (ret) dev_err(&pdev->dev, "imx_pcm_dma_init failed: %d\n", ret); - goto error_component; - } - - return ret; - -error_component: - snd_soc_unregister_component(&pdev->dev); return ret; } @@ -1196,7 +1189,6 @@ error_component: static int fsl_spdif_remove(struct platform_device *pdev) { imx_pcm_dma_exit(pdev); - snd_soc_unregister_component(&pdev->dev); return 0; } |