diff options
| author | Qinglang Miao <miaoqinglang@huawei.com> | 2020-09-29 19:29:33 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-09-30 12:40:30 +0100 |
| commit | ad61b78ea8913e5cf9c91f5527428eed1bd2a862 (patch) | |
| tree | 37585ab2b7fa6b98995e3d448bf5f1ee2ad8b765 | |
| parent | 5061e488bc0cef34df1d6d9e25d7f3ec05500a1f (diff) | |
| download | lwn-ad61b78ea8913e5cf9c91f5527428eed1bd2a862.tar.gz lwn-ad61b78ea8913e5cf9c91f5527428eed1bd2a862.zip | |
ASoC: soc-core: 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/20200929112933.46977-1-miaoqinglang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/soc-core.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 681df493bb98..62370774e3ce 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1994,16 +1994,7 @@ static int soc_probe(struct platform_device *pdev) /* Bodge while we unpick instantiation */ card->dev = &pdev->dev; - return snd_soc_register_card(card); -} - -/* removes a socdev */ -static int soc_remove(struct platform_device *pdev) -{ - struct snd_soc_card *card = platform_get_drvdata(pdev); - - snd_soc_unregister_card(card); - return 0; + return devm_snd_soc_register_card(&pdev->dev, card); } int snd_soc_poweroff(struct device *dev) @@ -2047,7 +2038,6 @@ static struct platform_driver soc_driver = { .pm = &snd_soc_pm_ops, }, .probe = soc_probe, - .remove = soc_remove, }; /** |