[PATCH 0/2] Fixes to couple DAPM widget functions

[PATCH 0/2] Fixes to couple DAPM widget functions

[Jarkko Nikula]

API change done by the commit 9af6d9562414568ecadf96aaef5b88e7e8b19821,
"[ALSA] soc - Add support for passing kcontrols with events", doesn't change
affected pxa machine and wm9712 drivers.

These two patches are generated from master branch of linux-2.6-asoc tree but
they apply to alsa git and alsa-kernel hg trees as well. I separated wm9712
to own patch since it is ok in asoc-v2-dev branch. There are other drivers
as well with this error in asoc-v2-dev but I don't know are they already in
progress? I can post a another patch to them if needed.

-- 
Jarkko

[PATCH 1/2] ASoC: Fix DAPM widget function types in pxa machine drivers

[Jarkko Nikula]

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

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
---
 sound/soc/pxa/corgi.c  |    6 ++++--
 sound/soc/pxa/poodle.c |    3 ++-
 sound/soc/pxa/spitz.c  |    3 ++-
 sound/soc/pxa/tosa.c   |    3 ++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index 3f34e53..1a70a6a 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -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);
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index 5ae59bd..4fbf8bb 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -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,
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index d56709e..ecca390 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -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))
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index e4d40b5..7346d7e 100644
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -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);
-- 
1.5.3.8

[PATCH 2/2] ASoC: Fix WM9712 mixer_event DAPM widget function type

[Jarkko Nikula]

Add kcontrol argument to function since the API was changed by the commit
9af6d9562414568ecadf96aaef5b88e7e8b19821.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
---
 sound/soc/codecs/wm9712.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index 590baea..524f745 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -176,7 +176,8 @@ static int wm9712_add_controls(struct snd_soc_codec *codec)
  * the codec only has a single control that is shared by both channels.
  * This makes it impossible to determine the audio path.
  */
-static int mixer_event (struct snd_soc_dapm_widget *w, int event)
+static int mixer_event(struct snd_soc_dapm_widget *w,
+	struct snd_kcontrol *k, int event)
 {
 	u16 l, r, beep, line, phone, mic, pcm, aux;
 
-- 
1.5.3.8

Re: [PATCH 0/2] Fixes to couple DAPM widget functions

[Takashi Iwai]

At Thu, 28 Feb 2008 11:53:08 +0200,
Jarkko Nikula wrote:
> 
> API change done by the commit 9af6d9562414568ecadf96aaef5b88e7e8b19821,
> "[ALSA] soc - Add support for passing kcontrols with events", doesn't change
> affected pxa machine and wm9712 drivers.
> 
> These two patches are generated from master branch of linux-2.6-asoc tree but
> they apply to alsa git and alsa-kernel hg trees as well. I separated wm9712
> to own patch since it is ok in asoc-v2-dev branch. There are other drivers
> as well with this error in asoc-v2-dev but I don't know are they already in
> progress? I can post a another patch to them if needed.

Thanks, applied to ALSA tree.
These are to be pushed to 2.6.25, too...


Takashi

Re: [PATCH 0/2] Fixes to couple DAPM widget functions

[Mark Brown]

On Thu, Feb 28, 2008 at 11:53:08AM +0200, Jarkko Nikula wrote:

> to own patch since it is ok in asoc-v2-dev branch. There are other drivers
> as well with this error in asoc-v2-dev but I don't know are they already in
> progress? I can post a another patch to them if needed.

Please go ahead - there's reworking in progress for all the v2 API
changes but if you've done the work already there's no sense in
replicating it.  The current work is all public.

Re: [PATCH 0/2] Fixes to couple DAPM widget functions

[Jarkko Nikula]

On Thu, 28 Feb 2008 12:29:27 +0000
"ext Mark Brown" <broonie@opensource.wolfsonmicro.com> wrote:

> On Thu, Feb 28, 2008 at 11:53:08AM +0200, Jarkko Nikula wrote:
> 
> > to own patch since it is ok in asoc-v2-dev branch. There are other drivers
> > as well with this error in asoc-v2-dev but I don't know are they already in
> > progress? I can post a another patch to them if needed.
> 
> Please go ahead - there's reworking in progress for all the v2 API
> changes but if you've done the work already there's no sense in
> replicating it.  The current work is all public.
>
Did it only now :-)

========================== CUT HERE ==========================
From: Jarkko Nikula <jarkko.nikula@nokia.com>
Date: Thu, 28 Feb 2008 15:18:38 +0200
Subject: [PATCH] ASoC: Fix DAPM widget function types in various drivers. Part asoc-v2 branch

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

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
---
 sound/soc/codecs/wm8350.c           |    3 ++-
 sound/soc/pxa/h5000.c               |    3 ++-
 sound/soc/pxa/magician.c            |    9 ++++++---
 sound/soc/pxa/mainstone_bluetooth.c |    3 ++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index abf9bd8..5508dc1 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -274,7 +274,8 @@ static void wm8350_pga_work(struct work_struct *work)
  * WM8350 Controls
  */
 
-static int pga_event(struct snd_soc_dapm_widget *w, int event)
+static int pga_event(struct snd_soc_dapm_widget *w,
+	struct snd_kcontrol *k, int event)
 {
 	struct snd_soc_codec *codec = w->codec;
 	struct wm8350_data *wm8350_data = codec->private_data;
diff --git a/sound/soc/pxa/h5000.c b/sound/soc/pxa/h5000.c
index 58ab1dc..6767fc0 100644
--- a/sound/soc/pxa/h5000.c
+++ b/sound/soc/pxa/h5000.c
@@ -193,7 +193,8 @@ static int h5000_set_spk(struct snd_kcontrol *kcontrol,
 	return 1;
 };
 
-static int h5000_audio_power(struct snd_soc_dapm_widget *widget, int event) 
+static int h5000_audio_power(struct snd_soc_dapm_widget *widget,
+	struct snd_kcontrol *k, int event) 
 {
 	// mp - why do we need the ref count, dapm core should ref count all widget use.
 	static int power_use_count = 0;
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index f83c7fd..5d4f701 100644
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -333,7 +333,8 @@ static int magician_set_input(struct snd_kcontrol * kcontrol,
 	return 1;
 }
 
-static int magician_spk_power(struct snd_soc_dapm_widget *w, int event)
+static int magician_spk_power(struct snd_soc_dapm_widget *w,
+			      struct snd_kcontrol *k, int event)
 {
 	if (SND_SOC_DAPM_EVENT_ON(event))
 		magician_egpio_enable(&magician_cpld,
@@ -344,7 +345,8 @@ static int magician_spk_power(struct snd_soc_dapm_widget *w, int event)
 	return 0;
 }
 
-static int magician_hp_power(struct snd_soc_dapm_widget *w, int event)
+static int magician_hp_power(struct snd_soc_dapm_widget *w,
+			     struct snd_kcontrol *k, int event)
 {
 	if (SND_SOC_DAPM_EVENT_ON(event))
 		magician_egpio_enable(&magician_cpld,
@@ -355,7 +357,8 @@ static int magician_hp_power(struct snd_soc_dapm_widget *w, int event)
 	return 0;
 }
 
-static int magician_mic_bias(struct snd_soc_dapm_widget *w, int event)
+static int magician_mic_bias(struct snd_soc_dapm_widget *w,
+			     struct snd_kcontrol *k, int event)
 {
 //	if (SND_SOC_DAPM_EVENT_ON(event))
 //		magician_egpio_enable(&magician_cpld,
diff --git a/sound/soc/pxa/mainstone_bluetooth.c b/sound/soc/pxa/mainstone_bluetooth.c
index c79e97d..53df17e 100644
--- a/sound/soc/pxa/mainstone_bluetooth.c
+++ b/sound/soc/pxa/mainstone_bluetooth.c
@@ -219,7 +219,8 @@ static int soc_card_set_mic(struct snd_kcontrol *kcontrol,
 }
 
 /* turns on board speaker amp on/off */
-static int soc_card_amp_event(struct snd_soc_dapm_widget *w, int event)
+static int soc_card_amp_event(struct snd_soc_dapm_widget *w,
+	struct snd_kcontrol *k, int event)
 {
 #if 0
 	if (SND_SOC_DAPM_EVENT_ON(event))
-- 
1.5.3.8

Re: [PATCH 0/2] Fixes to couple DAPM widget functions

[Mark Brown]

On Thu, Feb 28, 2008 at 03:29:23PM +0200, Jarkko Nikula wrote:

> Did it only now :-)

Applied, thanks.