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

Commit 338c7ed0 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Takashi Iwai
Browse files

[ALSA] ASoC: Fix DAPM widget function types in pxa machine drivers 



Add kcontrol argument to functions since the API was changed by the commit
9af6d956.

Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 31bffaa9

sound/soc/pxa/corgi.c

+4 −2
Original line number Diff line number Diff line
@@ -215,7 +215,8 @@ static int corgi_set_spk(struct snd_kcontrol *kcontrol, 
	return 1;

}



static int corgi_amp_event(struct snd_soc_dapm_widget *w, int event)

static int corgi_amp_event(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *k, int event)

{

	if (SND_SOC_DAPM_EVENT_ON(event))

		set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_APM_ON);
@@ -225,7 +226,8 @@ static int corgi_amp_event(struct snd_soc_dapm_widget *w, int event) 
	return 0;

}



static int corgi_mic_event(struct snd_soc_dapm_widget *w, int event)

static int corgi_mic_event(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *k, int event)

{

	if (SND_SOC_DAPM_EVENT_ON(event))

		set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MIC_BIAS);

sound/soc/pxa/poodle.c

+2 −1
Original line number Diff line number Diff line
@@ -196,7 +196,8 @@ static int poodle_set_spk(struct snd_kcontrol *kcontrol, 
	return 1;

}



static int poodle_amp_event(struct snd_soc_dapm_widget *w, int event)

static int poodle_amp_event(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *k, int event)

{

	if (SND_SOC_DAPM_EVENT_ON(event))

		locomo_gpio_write(&poodle_locomo_device.dev,

sound/soc/pxa/spitz.c

+2 −1
Original line number Diff line number Diff line
@@ -215,7 +215,8 @@ static int spitz_set_spk(struct snd_kcontrol *kcontrol, 
	return 1;

}



static int spitz_mic_bias(struct snd_soc_dapm_widget *w, int event)

static int spitz_mic_bias(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *k, int event)

{

	if (machine_is_borzoi() || machine_is_spitz()) {

		if (SND_SOC_DAPM_EVENT_ON(event))

sound/soc/pxa/tosa.c

+2 −1
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ static int tosa_set_spk(struct snd_kcontrol *kcontrol, 
}



/* tosa dapm event handlers */

static int tosa_hp_event(struct snd_soc_dapm_widget *w, int event)

static int tosa_hp_event(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *k, int event)

{

	if (SND_SOC_DAPM_EVENT_ON(event))

		set_tc6393_gpio(&tc6393_device.dev,TOSA_TC6393_L_MUTE);