diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-16 13:02:28 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-16 19:50:50 -0400 |
commit | 9a8e0322f0a8c7506f4ced07ec2a7e7e2a9cbe4a (patch) | |
tree | 98cd22f799bf9f405f56baa9901190adf3be3b73 | |
parent | e3c51ca8fa4a0f3f13ba9be80bee2708cd723934 (diff) |
ASoC: smdk_wm8994: Use devm_snd_soc_unregister_card()
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | sound/soc/samsung/smdk_wm8994.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c index 5fd7a05a9b9e..831972d24fb9 100644 --- a/sound/soc/samsung/smdk_wm8994.c +++ b/sound/soc/samsung/smdk_wm8994.c | |||
@@ -193,7 +193,7 @@ static int smdk_audio_probe(struct platform_device *pdev) | |||
193 | 193 | ||
194 | platform_set_drvdata(pdev, board); | 194 | platform_set_drvdata(pdev, board); |
195 | 195 | ||
196 | ret = snd_soc_register_card(card); | 196 | ret = devm_snd_soc_register_card(&pdev->dev, card); |
197 | 197 | ||
198 | if (ret) | 198 | if (ret) |
199 | dev_err(&pdev->dev, "snd_soc_register_card() failed:%d\n", ret); | 199 | dev_err(&pdev->dev, "snd_soc_register_card() failed:%d\n", ret); |
@@ -201,15 +201,6 @@ static int smdk_audio_probe(struct platform_device *pdev) | |||
201 | return ret; | 201 | return ret; |
202 | } | 202 | } |
203 | 203 | ||
204 | static int smdk_audio_remove(struct platform_device *pdev) | ||
205 | { | ||
206 | struct snd_soc_card *card = platform_get_drvdata(pdev); | ||
207 | |||
208 | snd_soc_unregister_card(card); | ||
209 | |||
210 | return 0; | ||
211 | } | ||
212 | |||
213 | static struct platform_driver smdk_audio_driver = { | 204 | static struct platform_driver smdk_audio_driver = { |
214 | .driver = { | 205 | .driver = { |
215 | .name = "smdk-audio-wm8894", | 206 | .name = "smdk-audio-wm8894", |
@@ -217,7 +208,6 @@ static struct platform_driver smdk_audio_driver = { | |||
217 | .of_match_table = of_match_ptr(samsung_wm8994_of_match), | 208 | .of_match_table = of_match_ptr(samsung_wm8994_of_match), |
218 | }, | 209 | }, |
219 | .probe = smdk_audio_probe, | 210 | .probe = smdk_audio_probe, |
220 | .remove = smdk_audio_remove, | ||
221 | }; | 211 | }; |
222 | 212 | ||
223 | module_platform_driver(smdk_audio_driver); | 213 | module_platform_driver(smdk_audio_driver); |