summaryrefslogtreecommitdiffstats
path: root/kernel/sound/soc/pxa/ttc-dkb.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sound/soc/pxa/ttc-dkb.c')
-rw-r--r--kernel/sound/soc/pxa/ttc-dkb.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/kernel/sound/soc/pxa/ttc-dkb.c b/kernel/sound/soc/pxa/ttc-dkb.c
index 1753c7d9e..65c20f779 100644
--- a/kernel/sound/soc/pxa/ttc-dkb.c
+++ b/kernel/sound/soc/pxa/ttc-dkb.c
@@ -128,7 +128,7 @@ static int ttc_dkb_probe(struct platform_device *pdev)
card->dev = &pdev->dev;
- 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",
ret);
@@ -136,22 +136,12 @@ static int ttc_dkb_probe(struct platform_device *pdev)
return ret;
}
-static int ttc_dkb_remove(struct platform_device *pdev)
-{
- struct snd_soc_card *card = platform_get_drvdata(pdev);
-
- snd_soc_unregister_card(card);
-
- return 0;
-}
-
static struct platform_driver ttc_dkb_driver = {
.driver = {
.name = "ttc-dkb-audio",
.pm = &snd_soc_pm_ops,
},
.probe = ttc_dkb_probe,
- .remove = ttc_dkb_remove,
};
module_platform_driver(ttc_dkb_driver);