aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManish Badarkhe <badarkhe.manish@gmail.com>2014-07-08 12:25:23 -0400
committerMark Brown <broonie@linaro.org>2014-07-09 04:14:52 -0400
commit36765c9c0623e87ab5ac6cfc07f66072b83edfdc (patch)
treeeed53fe69019230112d109fc860046a35b443c5c
parent76a77f47123945f6e5a4dd167e54768012ef9669 (diff)
ASoC: omap-mcbsp: Use devm_snd_soc_register_component
Replaced snd_soc_register_component with its devres equivalent, devm_snd_soc_register_component. Signed-off-by: Manish Badarkhe <badarkhe.manish@gmail.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/omap/omap-mcbsp.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index efe2cd699b77..bd3ef2a88be0 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -805,8 +805,9 @@ static int asoc_mcbsp_probe(struct platform_device *pdev)
805 if (ret) 805 if (ret)
806 return ret; 806 return ret;
807 807
808 ret = snd_soc_register_component(&pdev->dev, &omap_mcbsp_component, 808 ret = devm_snd_soc_register_component(&pdev->dev,
809 &omap_mcbsp_dai, 1); 809 &omap_mcbsp_component,
810 &omap_mcbsp_dai, 1);
810 if (ret) 811 if (ret)
811 return ret; 812 return ret;
812 813
@@ -817,8 +818,6 @@ static int asoc_mcbsp_remove(struct platform_device *pdev)
817{ 818{
818 struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev); 819 struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev);
819 820
820 snd_soc_unregister_component(&pdev->dev);
821
822 if (mcbsp->pdata->ops && mcbsp->pdata->ops->free) 821 if (mcbsp->pdata->ops && mcbsp->pdata->ops->free)
823 mcbsp->pdata->ops->free(mcbsp->id); 822 mcbsp->pdata->ops->free(mcbsp->id);
824 823