ASoC: fsl: imx-es8328: use devm_snd_soc_register_card()
authorYang Yingliang <yangyingliang@huawei.com>
Wed, 2 Jun 2021 13:33:59 +0000 (21:33 +0800)
committerMark Brown <broonie@kernel.org>
Thu, 3 Jun 2021 13:00:00 +0000 (14:00 +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/20210602133359.310647-1-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/fsl/imx-es8328.c

index fad1eb6..1981dcd 100644 (file)
@@ -193,7 +193,7 @@ static int imx_es8328_probe(struct platform_device *pdev)
        data->card.owner = THIS_MODULE;
        data->card.dai_link = &data->dai;
 
-       ret = snd_soc_register_card(&data->card);
+       ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
        if (ret) {
                dev_err(dev, "Unable to register: %d\n", ret);
                goto put_device;
@@ -209,15 +209,6 @@ fail:
        return ret;
 }
 
-static int imx_es8328_remove(struct platform_device *pdev)
-{
-       struct imx_es8328_data *data = platform_get_drvdata(pdev);
-
-       snd_soc_unregister_card(&data->card);
-
-       return 0;
-}
-
 static const struct of_device_id imx_es8328_dt_ids[] = {
        { .compatible = "fsl,imx-audio-es8328", },
        { /* sentinel */ }
@@ -230,7 +221,6 @@ static struct platform_driver imx_es8328_driver = {
                .of_match_table = imx_es8328_dt_ids,
        },
        .probe = imx_es8328_probe,
-       .remove = imx_es8328_remove,
 };
 module_platform_driver(imx_es8328_driver);