summaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa/e800_wm9712.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/e800_wm9712.c
parent6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff)
downloadblackbird-obmc-linux-2fd7076a43710666b147e206866ecd946b0b33e5.tar.gz
blackbird-obmc-linux-2fd7076a43710666b147e206866ecd946b0b33e5.zip
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/e800_wm9712.c')
-rw-r--r--sound/soc/pxa/e800_wm9712.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c
index 45d4bd46fff6..41bf71466a7b 100644
--- a/sound/soc/pxa/e800_wm9712.c
+++ b/sound/soc/pxa/e800_wm9712.c
@@ -119,7 +119,7 @@ static int e800_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);
@@ -130,10 +130,7 @@ static int e800_probe(struct platform_device *pdev)
static int e800_remove(struct platform_device *pdev)
{
- struct snd_soc_card *card = platform_get_drvdata(pdev);
-
gpio_free_array(e800_audio_gpios, ARRAY_SIZE(e800_audio_gpios));
- snd_soc_unregister_card(card);
return 0;
}
OpenPOWER on IntegriCloud