]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
ASoC: tegra: trimslice.c: use devm_snd_soc_register_card()
authorQinglang Miao <miaoqinglang@huawei.com>
Tue, 29 Sep 2020 11:29:39 +0000 (19:29 +0800)
committerMark Brown <broonie@kernel.org>
Thu, 1 Oct 2020 19:28:17 +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/20200929112939.47661-1-miaoqinglang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/tegra/trimslice.c

index cdb386d6e5c3c73f375b79b69a719f490af4bcef..baae4cce7fc66710dd8cda2dc1fcc10199290028 100644 (file)
@@ -143,7 +143,7 @@ static int tegra_snd_trimslice_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);
@@ -153,15 +153,6 @@ static int tegra_snd_trimslice_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int tegra_snd_trimslice_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 trimslice_of_match[] = {
        { .compatible = "nvidia,tegra-audio-trimslice", },
        {},
@@ -174,7 +165,6 @@ static struct platform_driver tegra_snd_trimslice_driver = {
                .of_match_table = trimslice_of_match,
        },
        .probe = tegra_snd_trimslice_probe,
-       .remove = tegra_snd_trimslice_remove,
 };
 module_platform_driver(tegra_snd_trimslice_driver);