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

Commit 16088cb6 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ASoC: Fix wrong argument for card remove callbacks 



The commit [e1d4d3c8: ASoC: free jack GPIOs before the sound card is
freed] introduced snd_soc_card remove callbacks to a few drivers, but
they are implemented with a wrong argument type.  The callback should
receive snd_soc_card pointer instead of snd_soc_pcm_runtime.

Fixes: e1d4d3c8 ('ASoC: free jack GPIOs before the sound card is freed')
Acked-by: default avatarMark Brown <broonie@linaro.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8743dcd6

sound/soc/omap/ams-delta.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd) 
	return 0;

}



static int ams_delta_card_remove(struct snd_soc_pcm_runtime *rtd)

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),

sound/soc/omap/omap-twl4030.c

+1 −2
Original line number Diff line number Diff line
@@ -231,9 +231,8 @@ static int omap_twl4030_init(struct snd_soc_pcm_runtime *rtd) 
	return ret;

}



static int omap_twl4030_card_remove(struct snd_soc_pcm_runtime *rtd)

static int omap_twl4030_card_remove(struct snd_soc_card *card)

{

	struct snd_soc_card *card = rtd->card;

	struct omap_twl4030 *priv = snd_soc_card_get_drvdata(card);



	if (priv->jack_detect > 0)

sound/soc/omap/rx51.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd) 
	return err;

}



static int rx51_card_remove(struct snd_soc_pcm_runtime *rtd)

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);

sound/soc/pxa/hx4700.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static int hx4700_ak4641_init(struct snd_soc_pcm_runtime *rtd) 
	return err;

}



static int hx4700_card_remove(struct snd_soc_pcm_runtime *rtd)

static int hx4700_card_remove(struct snd_soc_card *card)

{

	snd_soc_jack_free_gpios(&hs_jack, 1, &hs_jack_gpio);

sound/soc/samsung/h1940_uda1380.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static int h1940_uda1380_init(struct snd_soc_pcm_runtime *rtd) 
	return 0;

}



static int h1940_uda1380_card_remove(struct snd_soc_pcm_runtime *rtd)

static int h1940_uda1380_card_remove(struct snd_soc_card *card)

{

	snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios),

		hp_jack_gpios);