diff options
| author | Axel Lin <axel.lin@ingics.com> | 2015-09-01 10:32:59 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-09-14 18:33:41 +0100 |
| commit | 2fd7076a43710666b147e206866ecd946b0b33e5 (patch) | |
| tree | 8b2ab2d79501d59435735395053bf49b65ff992d /sound/soc/pxa/hx4700.c | |
| parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) | |
| download | linux-stable-2fd7076a43710666b147e206866ecd946b0b33e5.tar.gz linux-stable-2fd7076a43710666b147e206866ecd946b0b33e5.tar.bz2 linux-stable-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/hx4700.c')
| -rw-r--r-- | sound/soc/pxa/hx4700.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c index 9f8be7cd567e..ecbf2873b7ff 100644 --- a/sound/soc/pxa/hx4700.c +++ b/sound/soc/pxa/hx4700.c @@ -193,7 +193,7 @@ static int hx4700_audio_probe(struct platform_device *pdev) return ret; snd_soc_card_hx4700.dev = &pdev->dev; - ret = snd_soc_register_card(&snd_soc_card_hx4700); + ret = devm_snd_soc_register_card(&pdev->dev, &snd_soc_card_hx4700); if (ret) gpio_free_array(hx4700_audio_gpios, ARRAY_SIZE(hx4700_audio_gpios)); @@ -203,8 +203,6 @@ static int hx4700_audio_probe(struct platform_device *pdev) static int hx4700_audio_remove(struct platform_device *pdev) { - snd_soc_unregister_card(&snd_soc_card_hx4700); - gpio_set_value(GPIO92_HX4700_HP_DRIVER, 0); gpio_set_value(GPIO107_HX4700_SPK_nSD, 0); |