summaryrefslogtreecommitdiff
path: root/sound/soc/pxa/brownstone.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-09-01 10:32:59 +0800
committerMark Brown <broonie@kernel.org>2015-09-14 18:33:41 +0100
commit2fd7076a43710666b147e206866ecd946b0b33e5 (patch)
tree8b2ab2d79501d59435735395053bf49b65ff992d /sound/soc/pxa/brownstone.c
parent6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff)
ASoC: pxa: 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/pxa/brownstone.c')
-rw-r--r--sound/soc/pxa/brownstone.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c
index 2b26318bc200..6147e86e9b0f 100644
--- a/sound/soc/pxa/brownstone.c
+++ b/sound/soc/pxa/brownstone.c
@@ -116,26 +116,19 @@ static int brownstone_probe(struct platform_device *pdev)
int ret;
brownstone.dev = &pdev->dev;
- ret = snd_soc_register_card(&brownstone);
+ ret = devm_snd_soc_register_card(&pdev->dev, &brownstone);
if (ret)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
ret);
return ret;
}
-static int brownstone_remove(struct platform_device *pdev)
-{
- snd_soc_unregister_card(&brownstone);
- return 0;
-}
-
static struct platform_driver mmp_driver = {
.driver = {
.name = "brownstone-audio",
.pm = &snd_soc_pm_ops,
},
.probe = brownstone_probe,
- .remove = brownstone_remove,
};
module_platform_driver(mmp_driver);