Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

sound/soc/omap/ams-delta.c

+0 −10
Original line number Diff line number Diff line
@@ -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,

sound/soc/omap/omap-twl4030.c

+0 −13
Original line number Diff line number Diff line
@@ -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),

sound/soc/omap/rx51.c

+0 −9
Original line number Diff line number Diff line
@@ -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,