diff options
| author | Mark Brown <broonie@kernel.org> | 2020-10-09 17:42:31 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-10-09 17:42:31 +0300 |
| commit | c890e30b069a2792a5a34e8510a7a437dd6f5b3d (patch) | |
| tree | f7fc7cb5e6fddbe4cae599b41bb39ebc349b94cd /sound/soc/tegra/trimslice.c | |
| parent | 7ffe09eebf732f9c95623613fb706dada858c07d (diff) | |
| parent | 86f29c7442ac4ba5fe19fc2ada457f76c0080dd6 (diff) | |
| download | linux-c890e30b069a2792a5a34e8510a7a437dd6f5b3d.tar.xz | |
Merge remote-tracking branch 'asoc/for-5.10' into asoc-next
Diffstat (limited to 'sound/soc/tegra/trimslice.c')
| -rw-r--r-- | sound/soc/tegra/trimslice.c | 12 |
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); |