]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: omap-mcbsp: Use devm_snd_soc_register_component
authorManish Badarkhe <badarkhe.manish@gmail.com>
Tue, 8 Jul 2014 16:25:23 +0000 (21:55 +0530)
committerMark Brown <broonie@linaro.org>
Wed, 9 Jul 2014 08:14:52 +0000 (10:14 +0200)
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>
sound/soc/omap/omap-mcbsp.c

index efe2cd699b77d5ad6524faeec558bf95c5e74408..bd3ef2a88be0847b1972ab43564017c624fd3089 100644 (file)
@@ -805,8 +805,9 @@ static int asoc_mcbsp_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       ret = snd_soc_register_component(&pdev->dev, &omap_mcbsp_component,
-                                        &omap_mcbsp_dai, 1);
+       ret = devm_snd_soc_register_component(&pdev->dev,
+                                             &omap_mcbsp_component,
+                                             &omap_mcbsp_dai, 1);
        if (ret)
                return ret;
 
@@ -817,8 +818,6 @@ static int asoc_mcbsp_remove(struct platform_device *pdev)
 {
        struct omap_mcbsp *mcbsp = platform_get_drvdata(pdev);
 
-       snd_soc_unregister_component(&pdev->dev);
-
        if (mcbsp->pdata->ops && mcbsp->pdata->ops->free)
                mcbsp->pdata->ops->free(mcbsp->id);