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/omap | |
| parent | ac97d4e00a8356e61806fe7b223c0b7021908577 (diff) | |
| parent | 4fa8dbc18e8a57ea21c63103abdea042ab923202 (diff) | |
| download | linux-99a0ea2d5bbba87f3cfae7a1ac38846a678ee397.tar.xz | |
Merge remote-tracking branch 'asoc/topic/devm' into asoc-next
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/omap-mcpdm.c | 12 | ||||
| -rw-r--r-- | sound/soc/omap/omap-twl4030.c | 5 |
2 files changed, 5 insertions, 12 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); diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c index 2a9324f..6a8d6b5 100644 --- a/sound/soc/omap/omap-twl4030.c +++ b/sound/soc/omap/omap-twl4030.c @@ -338,9 +338,9 @@ static int omap_twl4030_probe(struct platform_device *pdev) } snd_soc_card_set_drvdata(card, priv); - ret = snd_soc_register_card(card); + ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) { - dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", + dev_err(&pdev->dev, "devm_snd_soc_register_card() failed: %d\n", ret); return ret; } @@ -357,7 +357,6 @@ static int omap_twl4030_remove(struct platform_device *pdev) snd_soc_jack_free_gpios(&priv->hs_jack, ARRAY_SIZE(hs_jack_gpios), hs_jack_gpios); - snd_soc_unregister_card(card); return 0; } |