hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: omap-abe-twl6040: Use devm_snd_soc_register_card() 

Using devm_snd_soc_register_card() can make the code
shorter and cleaner.

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Wei Yongjun 2016-08-23 23:10:17 +00:00 committed by Mark Brown
parent f6ccdc44dd
commit 687df1ad84
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/soc/omap/omap-abe-twl6040.c
View File

@ -305,23 +305,14 @@ static int omap_abe_probe(struct platform_device *pdev)
snd_soc_card_set_drvdata(card, priv); snd_soc_card_set_drvdata(card, priv);
ret = snd_soc_register_card(card); ret = devm_snd_soc_register_card(&pdev->dev, card);
if (ret) if (ret)
dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", dev_err(&pdev->dev, "devm_snd_soc_register_card() failed: %d\n",
ret); ret);
return ret; return ret;
} }
static int omap_abe_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 omap_abe_of_match[] = { static const struct of_device_id omap_abe_of_match[] = {
{.compatible = "ti,abe-twl6040", }, {.compatible = "ti,abe-twl6040", },
{ }, { },
@ -335,7 +326,6 @@ static struct platform_driver omap_abe_driver = {
.of_match_table = omap_abe_of_match, .of_match_table = omap_abe_of_match,
}, },
.probe = omap_abe_probe, .probe = omap_abe_probe,
.remove = omap_abe_remove,
}; };
static int __init omap_abe_init(void) static int __init omap_abe_init(void)