summaryrefslogtreecommitdiffstats
path: root/sound/soc/blackfin/bfin-eval-adav80x.c
diff options
context:
space:
mode:
authorAxel Lin2015-08-30 11:17:44 +0200
committerMark Brown2015-09-14 19:32:58 +0200
commit76b0d1f5e748630e01763d7fd6bec8436af7ec51 (patch)
treec0ec1718127dd88c66b79d355f16d052f4292794 /sound/soc/blackfin/bfin-eval-adav80x.c
parentLinux 4.3-rc1 (diff)
downloadkernel-qcow2-linux-76b0d1f5e748630e01763d7fd6bec8436af7ec51.tar.gz
kernel-qcow2-linux-76b0d1f5e748630e01763d7fd6bec8436af7ec51.tar.xz
kernel-qcow2-linux-76b0d1f5e748630e01763d7fd6bec8436af7ec51.zip
ASoC: blackfin: Convert to devm_snd_soc_register_card
Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/blackfin/bfin-eval-adav80x.c')
-rw-r--r--sound/soc/blackfin/bfin-eval-adav80x.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/sound/soc/blackfin/bfin-eval-adav80x.c b/sound/soc/blackfin/bfin-eval-adav80x.c
index 27eee66afdb2..1037477d10b2 100644
--- a/sound/soc/blackfin/bfin-eval-adav80x.c
+++ b/sound/soc/blackfin/bfin-eval-adav80x.c
@@ -119,16 +119,7 @@ static int bfin_eval_adav80x_probe(struct platform_device *pdev)
card->dev = &pdev->dev;
- return snd_soc_register_card(&bfin_eval_adav80x);
-}
-
-static int bfin_eval_adav80x_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_adav80x);
}
static const struct platform_device_id bfin_eval_adav80x_ids[] = {
@@ -144,7 +135,6 @@ static struct platform_driver bfin_eval_adav80x_driver = {
.pm = &snd_soc_pm_ops,
},
.probe = bfin_eval_adav80x_probe,
- .remove = bfin_eval_adav80x_remove,
.id_table = bfin_eval_adav80x_ids,
};