diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:27 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:27 (GMT) |
| commit | 99a0ea2d5bbba87f3cfae7a1ac38846a678ee397 (patch) | |
| tree | 2ec02fae3a06c73057bb3abc0afb781ea812881e /sound/soc/fsl/fsl_spdif.c | |
| parent | ac97d4e00a8356e61806fe7b223c0b7021908577 (diff) | |
| parent | 4fa8dbc18e8a57ea21c63103abdea042ab923202 (diff) | |
| download | linux-fsl-qoriq-99a0ea2d5bbba87f3cfae7a1ac38846a678ee397.tar.xz | |
Merge remote-tracking branch 'asoc/topic/devm' into asoc-next
Diffstat (limited to 'sound/soc/fsl/fsl_spdif.c')
| -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 3920c3e..44378e6 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; } |