Merge tag 'pwm/for-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[linux-2.6-microblaze.git] / sound / soc / tegra / tegra_rt5640.c

diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c
index d66d865..c73bd23 100644 (file)
--- a/sound/soc/tegra/tegra_rt5640.c
+++ b/sound/soc/tegra/tegra_rt5640.c
@@ -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);