diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-20 15:20:24 (GMT) |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-20 15:20:24 (GMT) |
commit | 8b880f48eef80309da6d1c40f7526614b19ab12c (patch) | |
tree | 1ae728f4e2c4020d62940e8cdae75a5352bc3ae1 /sound/soc/omap/omap-mcpdm.c | |
parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
parent | 63e6d43bf80d3861dcda7ff4f37590f8de583156 (diff) | |
download | linux-fsl-qoriq-8b880f48eef80309da6d1c40f7526614b19ab12c.tar.xz |
Merge remote-tracking branch 'asoc/fix/ab8500' into asoc-linus
Diffstat (limited to 'sound/soc/omap/omap-mcpdm.c')
-rw-r--r-- | sound/soc/omap/omap-mcpdm.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index 90d2a7c..cd9ee16 100644 --- a/sound/soc/omap/omap-mcpdm.c +++ b/sound/soc/omap/omap-mcpdm.c @@ -490,14 +490,9 @@ static int asoc_mcpdm_probe(struct platform_device *pdev) mcpdm->dev = &pdev->dev; - return snd_soc_register_component(&pdev->dev, &omap_mcpdm_component, - &omap_mcpdm_dai, 1); -} - -static int asoc_mcpdm_remove(struct platform_device *pdev) -{ - snd_soc_unregister_component(&pdev->dev); - return 0; + return devm_snd_soc_register_component(&pdev->dev, + &omap_mcpdm_component, + &omap_mcpdm_dai, 1); } static const struct of_device_id omap_mcpdm_of_match[] = { @@ -514,7 +509,6 @@ static struct platform_driver asoc_mcpdm_driver = { }, .probe = asoc_mcpdm_probe, - .remove = asoc_mcpdm_remove, }; module_platform_driver(asoc_mcpdm_driver); |