diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-09-30 18:40:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-09-30 18:40:40 +0200 |
| commit | eeea8b40cd2866ca24f25e5ef09225edb076ae45 (patch) | |
| tree | ece5b5287ee2ce53a841b66d0f526947f74d036f /sound/soc/omap/omap-abe-twl6040.c | |
| parent | 3383c5c395386ac8e258b1a324c72ce850b84a9e (diff) | |
| parent | 513e43efafe329dad7b5794583b67ac898dcbdca (diff) | |
Merge tag 'asoc-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-nextsound-4.9-rc1
ASoC: Updates for v4.9
Apart from the cleanups done by Morimoto-san this has very much been a
driver focused release with very little generic change:
- A big factoring out of the simple-card code to allow it to be shared
more with the rcar generic card from Kuninori Morimoto.
- Removal of some operations duplicated on the CODEC level, again by
Kuninori Morimoto.
- Lots more machine support for x86 systems.
- New drivers for Nuvoton NAU88C10, Realtek RT5660 and RT5663.
Diffstat (limited to 'sound/soc/omap/omap-abe-twl6040.c')
| -rw-r--r-- | sound/soc/omap/omap-abe-twl6040.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index f61b3b58083b..89fe95e877db 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c @@ -305,23 +305,14 @@ static int omap_abe_probe(struct platform_device *pdev) snd_soc_card_set_drvdata(card, priv); - 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", + dev_err(&pdev->dev, "devm_snd_soc_register_card() failed: %d\n", 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[] = { {.compatible = "ti,abe-twl6040", }, { }, @@ -335,7 +326,6 @@ static struct platform_driver omap_abe_driver = { .of_match_table = omap_abe_of_match, }, .probe = omap_abe_probe, - .remove = omap_abe_remove, }; static int __init omap_abe_init(void) |