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

[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
...@@ -215,7 +215,8 @@ static int corgi_set_spk(struct snd_kcontrol *kcontrol, ...@@ -215,7 +215,8 @@ static int corgi_set_spk(struct snd_kcontrol *kcontrol,
return 1; 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)) if (SND_SOC_DAPM_EVENT_ON(event))
set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_APM_ON); 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) ...@@ -225,7 +226,8 @@ static int corgi_amp_event(struct snd_soc_dapm_widget *w, int event)
return 0; 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)) if (SND_SOC_DAPM_EVENT_ON(event))
set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MIC_BIAS); set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_MIC_BIAS);
......
...@@ -196,7 +196,8 @@ static int poodle_set_spk(struct snd_kcontrol *kcontrol, ...@@ -196,7 +196,8 @@ static int poodle_set_spk(struct snd_kcontrol *kcontrol,
return 1; 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)) if (SND_SOC_DAPM_EVENT_ON(event))
locomo_gpio_write(&poodle_locomo_device.dev, locomo_gpio_write(&poodle_locomo_device.dev,
......
...@@ -215,7 +215,8 @@ static int spitz_set_spk(struct snd_kcontrol *kcontrol, ...@@ -215,7 +215,8 @@ static int spitz_set_spk(struct snd_kcontrol *kcontrol,
return 1; 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 (machine_is_borzoi() || machine_is_spitz()) {
if (SND_SOC_DAPM_EVENT_ON(event)) if (SND_SOC_DAPM_EVENT_ON(event))
......
...@@ -135,7 +135,8 @@ static int tosa_set_spk(struct snd_kcontrol *kcontrol, ...@@ -135,7 +135,8 @@ static int tosa_set_spk(struct snd_kcontrol *kcontrol,
} }
/* tosa dapm event handlers */ /* 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)) if (SND_SOC_DAPM_EVENT_ON(event))
set_tc6393_gpio(&tc6393_device.dev,TOSA_TC6393_L_MUTE); set_tc6393_gpio(&tc6393_device.dev,TOSA_TC6393_L_MUTE);
......
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