summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/omap-twl4030.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-08-22 13:59:48 +0200
committerMark Brown <broonie@kernel.org>2017-08-22 13:38:53 +0100
commit90c265c65a3216ea236ed8e81d0a8d6411c26e88 (patch)
tree955cee06f184af7ac39d36f00505f88ab17e24a5 /sound/soc/omap/omap-twl4030.c
parent51f25e7f9270378cee0526184ecaaae6c847a5f6 (diff)
downloadlinux-stable-90c265c65a3216ea236ed8e81d0a8d6411c26e88.tar.gz
linux-stable-90c265c65a3216ea236ed8e81d0a8d6411c26e88.tar.bz2
linux-stable-90c265c65a3216ea236ed8e81d0a8d6411c26e88.zip
ASoC: omap: Remove superfluous snd_soc_jack_free_gpios() call
Since jack gpios are managed via devres, we don't have to call snd_jack_free_gpios() at release any longer. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/omap/omap-twl4030.c')
-rw-r--r--sound/soc/omap/omap-twl4030.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c
index a24b0dedabb9..cccc316743fa 100644
--- a/sound/soc/omap/omap-twl4030.c
+++ b/sound/soc/omap/omap-twl4030.c
@@ -208,18 +208,6 @@ static int omap_twl4030_init(struct snd_soc_pcm_runtime *rtd)
return ret;
}
-static int omap_twl4030_card_remove(struct snd_soc_card *card)
-{
- struct omap_twl4030 *priv = snd_soc_card_get_drvdata(card);
-
- if (priv->jack_detect > 0)
- snd_soc_jack_free_gpios(&priv->hs_jack,
- ARRAY_SIZE(hs_jack_gpios),
- hs_jack_gpios);
-
- return 0;
-}
-
/* Digital audio interface glue - connects codec <--> CPU */
static struct snd_soc_dai_link omap_twl4030_dai_links[] = {
{
@@ -247,7 +235,6 @@ static struct snd_soc_dai_link omap_twl4030_dai_links[] = {
/* Audio machine driver */
static struct snd_soc_card omap_twl4030_card = {
.owner = THIS_MODULE,
- .remove = omap_twl4030_card_remove,
.dai_link = omap_twl4030_dai_links,
.num_links = ARRAY_SIZE(omap_twl4030_dai_links),