summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorQinglang Miao <miaoqinglang@huawei.com>2020-09-29 19:29:39 +0800
committerMark Brown <broonie@kernel.org>2020-10-01 20:28:17 +0100
commit27f41dfebf226c74691b4b30527459417b6510e8 (patch)
tree66f5039fba1140bc08973f3125cf66266a7b25c3 /sound
parent1047bcac2169a05575476774bfd4a88f0a9c787d (diff)
downloadlinux-stable-27f41dfebf226c74691b4b30527459417b6510e8.tar.gz
linux-stable-27f41dfebf226c74691b4b30527459417b6510e8.tar.bz2
linux-stable-27f41dfebf226c74691b4b30527459417b6510e8.zip
ASoC: tegra: trimslice.c: use devm_snd_soc_register_card()
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/tegra/trimslice.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/sound/soc/tegra/trimslice.c b/sound/soc/tegra/trimslice.c
index cdb386d6e5c3..baae4cce7fc6 100644
--- a/sound/soc/tegra/trimslice.c
+++ b/sound/soc/tegra/trimslice.c
@@ -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);