ASoC: tegra: tegra_rt5640: use devm_snd_soc_register_card()
authorQinglang Miao <miaoqinglang@huawei.com>
Tue, 29 Sep 2020 11:29:36 +0000 (19:29 +0800)
committerMark Brown <broonie@kernel.org>
Thu, 1 Oct 2020 19:28:15 +0000 (20:28 +0100)
Using devm_snd_soc_register_card() can make the code
shorter and cleaner.

Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
Link: https://lore.kernel.org/r/20200929112936.47441-1-miaoqinglang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/tegra/tegra_rt5640.c

index d66d8659396b4a6fd7fe84ea5ab8c6b66a2cc4ca..c73bd23b3d679e1a203cb424e4ec1cf7465e25ca 100644 (file)
@@ -192,7 +192,7 @@ static int tegra_rt5640_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       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);
@@ -202,15 +202,6 @@ static int tegra_rt5640_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int tegra_rt5640_remove(struct platform_device *pdev)
-{
-       struct snd_soc_card *card = platform_get_drvdata(pdev);
-
-       snd_soc_unregister_card(card);
-
-       return 0;
-}
-
 static const struct of_device_id tegra_rt5640_of_match[] = {
        { .compatible = "nvidia,tegra-audio-rt5640", },
        {},
@@ -223,7 +214,6 @@ static struct platform_driver tegra_rt5640_driver = {
                .of_match_table = tegra_rt5640_of_match,
        },
        .probe = tegra_rt5640_probe,
-       .remove = tegra_rt5640_remove,
 };
 module_platform_driver(tegra_rt5640_driver);