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>

diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index 16cc95fa45731b3f9ed6f47896b95b0eadf3a025..6c49f3d6fd965bcbfe984f2fcf457c2bc832181b 100644 (file)
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -513,15 +513,6 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd)
        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 */
 static struct snd_soc_dai_link ams_delta_dai_link = {
        .name = "CX20442",
@@ -540,7 +531,6 @@ static struct snd_soc_dai_link ams_delta_dai_link = {
 static struct snd_soc_card ams_delta_audio_card = {
        .name = "AMS_DELTA",
        .owner = THIS_MODULE,
-       .remove = ams_delta_card_remove,
        .dai_link = &ams_delta_dai_link,
        .num_links = 1,
 

diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c
index a24b0dedabb9b20501f98247ea1a0dc311f52d7b..cccc316743fa682680bdf2d1d6e70b9cf8cc2ef7 100644 (file)
--- 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),
 

diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 3aeb65feaea1de397a7dfee59a0b5d036a22ebd5..57448bd5ad7703cb9084ce7409c4656721103f2f 100644 (file)
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -311,14 +311,6 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
        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 */
 static struct snd_soc_dai_link rx51_dai[] = {
        {
@@ -361,7 +353,6 @@ static struct snd_soc_codec_conf rx51_codec_conf[] = {
 static struct snd_soc_card rx51_sound_card = {
        .name = "RX-51",
        .owner = THIS_MODULE,
-       .remove = rx51_card_remove,
        .dai_link = rx51_dai,
        .num_links = ARRAY_SIZE(rx51_dai),
        .aux_dev = rx51_aux_dev,