diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-08 14:43:36 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-08 14:43:36 +0400 |
| commit | 6c61bbf0e844a035736272bd863d724d5f112ac5 (patch) | |
| tree | dba0f6231f916edd6fe32ca1e6256b75ee9ae5d5 /sound/soc/spear/spdif_in.c | |
| parent | bd6d35a370df0eff2398a413a2c9b3f8f81cbf9f (diff) | |
| parent | 25db0dc88016ec67ec4e38164482a3d7b7429f75 (diff) | |
| download | linux-6c61bbf0e844a035736272bd863d724d5f112ac5.tar.xz | |
Merge remote-tracking branch 'asoc/topic/spear' into asoc-next
Diffstat (limited to 'sound/soc/spear/spdif_in.c')
| -rw-r--r-- | sound/soc/spear/spdif_in.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/soc/spear/spdif_in.c b/sound/soc/spear/spdif_in.c index 63acfeb4b69d..21a8c954af1c 100644 --- a/sound/soc/spear/spdif_in.c +++ b/sound/soc/spear/spdif_in.c @@ -257,20 +257,12 @@ static int spdif_in_probe(struct platform_device *pdev) return ret; } - return snd_soc_register_component(&pdev->dev, &spdif_in_component, - &spdif_in_dai, 1); -} - -static int spdif_in_remove(struct platform_device *pdev) -{ - snd_soc_unregister_component(&pdev->dev); - - return 0; + return devm_snd_soc_register_component(&pdev->dev, &spdif_in_component, + &spdif_in_dai, 1); } static struct platform_driver spdif_in_driver = { .probe = spdif_in_probe, - .remove = spdif_in_remove, .driver = { .name = "spdif-in", .owner = THIS_MODULE, |