ASoC: atmel: sam9x5_wm8731: use devm_snd_soc_register_card()
authorYang Yingliang <yangyingliang@huawei.com>
Wed, 2 Jun 2021 14:16:19 +0000 (22:16 +0800)
committerMark Brown <broonie@kernel.org>
Thu, 3 Jun 2021 12:59:56 +0000 (13:59 +0100)
Using devm_snd_soc_register_card() can make the code
shorter and cleaner.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20210602141619.323286-1-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/atmel/sam9x5_wm8731.c

index 9fbc3c1..7745250 100644 (file)
@@ -159,7 +159,7 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev)
        of_node_put(codec_np);
        of_node_put(cpu_np);
 
-       ret = snd_soc_register_card(card);
+       ret = devm_snd_soc_register_card(&pdev->dev, card);
        if (ret) {
                dev_err(&pdev->dev, "Platform device allocation failed\n");
                goto out_put_audio;
@@ -180,7 +180,6 @@ static int sam9x5_wm8731_driver_remove(struct platform_device *pdev)
        struct snd_soc_card *card = platform_get_drvdata(pdev);
        struct sam9x5_drvdata *priv = card->drvdata;
 
-       snd_soc_unregister_card(card);
        atmel_ssc_put_audio(priv->ssc_id);
 
        return 0;