Commit 90c265c6 authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown

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: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 51f25e7f
...@@ -513,15 +513,6 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd) ...@@ -513,15 +513,6 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd)
return 0; return 0;
} }
static int ams_delta_card_remove(struct snd_soc_card *card)
{
snd_soc_jack_free_gpios(&ams_delta_hook_switch,
ARRAY_SIZE(ams_delta_hook_switch_gpios),
ams_delta_hook_switch_gpios);
return 0;
}
/* DAI glue - connects codec <--> CPU */ /* DAI glue - connects codec <--> CPU */
static struct snd_soc_dai_link ams_delta_dai_link = { static struct snd_soc_dai_link ams_delta_dai_link = {
.name = "CX20442", .name = "CX20442",
...@@ -540,7 +531,6 @@ static struct snd_soc_dai_link ams_delta_dai_link = { ...@@ -540,7 +531,6 @@ static struct snd_soc_dai_link ams_delta_dai_link = {
static struct snd_soc_card ams_delta_audio_card = { static struct snd_soc_card ams_delta_audio_card = {
.name = "AMS_DELTA", .name = "AMS_DELTA",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.remove = ams_delta_card_remove,
.dai_link = &ams_delta_dai_link, .dai_link = &ams_delta_dai_link,
.num_links = 1, .num_links = 1,
......
...@@ -208,18 +208,6 @@ static int omap_twl4030_init(struct snd_soc_pcm_runtime *rtd) ...@@ -208,18 +208,6 @@ static int omap_twl4030_init(struct snd_soc_pcm_runtime *rtd)
return ret; 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 */ /* Digital audio interface glue - connects codec <--> CPU */
static struct snd_soc_dai_link omap_twl4030_dai_links[] = { static struct snd_soc_dai_link omap_twl4030_dai_links[] = {
{ {
...@@ -247,7 +235,6 @@ 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 */ /* Audio machine driver */
static struct snd_soc_card omap_twl4030_card = { static struct snd_soc_card omap_twl4030_card = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.remove = omap_twl4030_card_remove,
.dai_link = omap_twl4030_dai_links, .dai_link = omap_twl4030_dai_links,
.num_links = ARRAY_SIZE(omap_twl4030_dai_links), .num_links = ARRAY_SIZE(omap_twl4030_dai_links),
......
...@@ -311,14 +311,6 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd) ...@@ -311,14 +311,6 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
return err; return err;
} }
static int rx51_card_remove(struct snd_soc_card *card)
{
snd_soc_jack_free_gpios(&rx51_av_jack, ARRAY_SIZE(rx51_av_jack_gpios),
rx51_av_jack_gpios);
return 0;
}
/* Digital audio interface glue - connects codec <--> CPU */ /* Digital audio interface glue - connects codec <--> CPU */
static struct snd_soc_dai_link rx51_dai[] = { static struct snd_soc_dai_link rx51_dai[] = {
{ {
...@@ -361,7 +353,6 @@ static struct snd_soc_codec_conf rx51_codec_conf[] = { ...@@ -361,7 +353,6 @@ static struct snd_soc_codec_conf rx51_codec_conf[] = {
static struct snd_soc_card rx51_sound_card = { static struct snd_soc_card rx51_sound_card = {
.name = "RX-51", .name = "RX-51",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.remove = rx51_card_remove,
.dai_link = rx51_dai, .dai_link = rx51_dai,
.num_links = ARRAY_SIZE(rx51_dai), .num_links = ARRAY_SIZE(rx51_dai),
.aux_dev = rx51_aux_dev, .aux_dev = rx51_aux_dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment