diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-11-02 09:00:37 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-11-02 09:00:37 +0100 |
commit | bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5 (patch) | |
tree | 1731a322d153ee18017822a8fd66295a0ec7a4e2 /sound/soc/blackfin/bfin-eval-adau1373.c | |
parent | cadd16ea33a938d49aee99edd4758cc76048b399 (diff) | |
parent | 2c8d08925272b9be383cd81f1973c6faf9fbf53a (diff) | |
download | blackbird-obmc-linux-bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5.tar.gz blackbird-obmc-linux-bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5.zip |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/blackfin/bfin-eval-adau1373.c')
-rw-r--r-- | sound/soc/blackfin/bfin-eval-adau1373.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sound/soc/blackfin/bfin-eval-adau1373.c b/sound/soc/blackfin/bfin-eval-adau1373.c index 523baf5820d7..72ac78988426 100644 --- a/sound/soc/blackfin/bfin-eval-adau1373.c +++ b/sound/soc/blackfin/bfin-eval-adau1373.c @@ -154,16 +154,7 @@ static int bfin_eval_adau1373_probe(struct platform_device *pdev) card->dev = &pdev->dev; - return snd_soc_register_card(&bfin_eval_adau1373); -} - -static int bfin_eval_adau1373_remove(struct platform_device *pdev) -{ - struct snd_soc_card *card = platform_get_drvdata(pdev); - - snd_soc_unregister_card(card); - - return 0; + return devm_snd_soc_register_card(&pdev->dev, &bfin_eval_adau1373); } static struct platform_driver bfin_eval_adau1373_driver = { @@ -172,7 +163,6 @@ static struct platform_driver bfin_eval_adau1373_driver = { .pm = &snd_soc_pm_ops, }, .probe = bfin_eval_adau1373_probe, - .remove = bfin_eval_adau1373_remove, }; module_platform_driver(bfin_eval_adau1373_driver); |