ASoC: smdk_wm8994: Use devm_snd_soc_unregister_card()
authorMark Brown <broonie@linaro.org>
Mon, 16 Sep 2013 17:02:28 +0000 (18:02 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 16 Sep 2013 23:50:50 +0000 (00:50 +0100)
Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/samsung/smdk_wm8994.c

index 5fd7a05a9b9e2fe9730a962bcdca73482a9e5d71..831972d24fb9b2019f34d147ebfdab505a63254d 100644 (file)
@@ -193,7 +193,7 @@ static int smdk_audio_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, board);
 
-       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);
@@ -201,15 +201,6 @@ static int smdk_audio_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int smdk_audio_remove(struct platform_device *pdev)
-{
-       struct snd_soc_card *card = platform_get_drvdata(pdev);
-
-       snd_soc_unregister_card(card);
-
-       return 0;
-}
-
 static struct platform_driver smdk_audio_driver = {
        .driver         = {
                .name   = "smdk-audio-wm8894",
@@ -217,7 +208,6 @@ static struct platform_driver smdk_audio_driver = {
                .of_match_table = of_match_ptr(samsung_wm8994_of_match),
        },
        .probe          = smdk_audio_probe,
-       .remove         = smdk_audio_remove,
 };
 
 module_platform_driver(smdk_audio_driver);