summaryrefslogtreecommitdiffstats
path: root/sound/soc/jz4740
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-04-22 22:46:34 +0200
committerMark Brown <broonie@linaro.org>2014-04-22 21:53:21 +0100
commit050f62e4de52901cc0f7aebbd64876d2639a8657 (patch)
treeb54caabd396d1aae06e3a733f95bc1549f9a7eeb /sound/soc/jz4740
parent0e746d7b2b2c31a29b78ddb364bca9a01bd64ae7 (diff)
downloadop-kernel-dev-050f62e4de52901cc0f7aebbd64876d2639a8657.zip
op-kernel-dev-050f62e4de52901cc0f7aebbd64876d2639a8657.tar.gz
ASoC: qi_lb60: Use devm_snd_soc_register_card()
Makes the code a bit shorter and will also allow us to remove the drivers remove() callback eventually. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/jz4740')
-rw-r--r--sound/soc/jz4740/qi_lb60.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c
index 72ce103..be0a437 100644
--- a/sound/soc/jz4740/qi_lb60.c
+++ b/sound/soc/jz4740/qi_lb60.c
@@ -86,7 +86,7 @@ static int qi_lb60_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);
@@ -97,9 +97,6 @@ static int qi_lb60_probe(struct platform_device *pdev)
static int qi_lb60_remove(struct platform_device *pdev)
{
- struct snd_soc_card *card = platform_get_drvdata(pdev);
-
- snd_soc_unregister_card(card);
gpio_free_array(qi_lb60_gpios, ARRAY_SIZE(qi_lb60_gpios));
return 0;
}
OpenPOWER on IntegriCloud