linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: build failure after merge of the sound-asoc tree
@ 2011-10-06  2:22 Stephen Rothwell
  2011-10-06  4:43 ` [PATCH] ASoC: fix codec breakage caused by the volsw/volsw_2r merger Peter Ujfalusi
  2011-10-06  6:59 ` [PATCH] ASoC: Replace remaining use of *_volsw_2r with *_volsw Peter Ujfalusi
  0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2011-10-06  2:22 UTC (permalink / raw)
  To: Mark Brown, Liam Girdwood; +Cc: linux-next, linux-kernel, Peter Ujfalusi

[-- Attachment #1: Type: text/plain, Size: 735 bytes --]

Hi all,

After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

sound/soc/codecs/wm_hubs.c: In function 'wm8993_put_dc_servo':
sound/soc/codecs/wm_hubs.c:225:2: error: implicit declaration of function 'snd_soc_put_volsw_2r' [-Werror=implicit-function-declaration]
sound/soc/codecs/wm_hubs.c: At top level:
sound/soc/codecs/wm_hubs.c:365:1: error: 'snd_soc_get_volsw_2r' undeclared here (not in a function)

Caused by commit 0f9887d11e7c ("ASoC: Consolidate use of controls with
custom get/put function").

I have used the sound-asoc tree from next-20111005 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] ASoC: fix codec breakage caused by the volsw/volsw_2r merger
  2011-10-06  2:22 linux-next: build failure after merge of the sound-asoc tree Stephen Rothwell
@ 2011-10-06  4:43 ` Peter Ujfalusi
  2011-10-06  6:59 ` [PATCH] ASoC: Replace remaining use of *_volsw_2r with *_volsw Peter Ujfalusi
  1 sibling, 0 replies; 4+ messages in thread
From: Peter Ujfalusi @ 2011-10-06  4:43 UTC (permalink / raw)
  To: Stephen Rothwell, Mark Brown; +Cc: linux-next, linux-kernel, Peter Ujfalusi

By accident few places still uses the _2r calls from
the core.
This is a quick fix, the drivers using the old callbacks
going to be changed.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---

Hi Stephen, Mark,

I'm really sorry, I can not explain how it happened.
Please find a quick fox for the issue.
I'm going to fix the drivers meanwhile.

Regards,
Peter

 include/sound/soc.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 88ba85a..858291d 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -393,6 +393,8 @@ int snd_soc_get_volsw(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol);
 int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol);
+#define snd_soc_get_volsw_2r snd_soc_get_volsw
+#define snd_soc_put_volsw_2r snd_soc_put_volsw
 int snd_soc_info_volsw_s8(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_info *uinfo);
 int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol,
-- 
1.7.7

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH] ASoC: Replace remaining use of *_volsw_2r with *_volsw
  2011-10-06  2:22 linux-next: build failure after merge of the sound-asoc tree Stephen Rothwell
  2011-10-06  4:43 ` [PATCH] ASoC: fix codec breakage caused by the volsw/volsw_2r merger Peter Ujfalusi
@ 2011-10-06  6:59 ` Peter Ujfalusi
  2011-10-06 10:16   ` Mark Brown
  1 sibling, 1 reply; 4+ messages in thread
From: Peter Ujfalusi @ 2011-10-06  6:59 UTC (permalink / raw)
  To: Stephen Rothwell, Mark Brown, Liam Girdwood
  Cc: linux-next, linux-kernel, alsa-devel, Peter Ujfalusi

The snd_soc_*_volsw_2r functionality has been merged to
*volsw callbacks.
Few places still used the get, or put variant of volsw_2r,
replace those with the corresponding *_volsw.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---

Hello Stephen, Mark,

It would be better to take this patch instead of the previous
"ASoC: fix codec breakage caused by the volsw/volsw_2r merger"
patch, so we do not need to remove the defines in a coming patch.

Thank you, and again sorry about the breakage.

Regards,
Peter

 sound/soc/codecs/wm8350.c  |    4 ++--
 sound/soc/codecs/wm8580.c  |    8 ++++----
 sound/soc/codecs/wm_hubs.c |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 50ea9d7..35f3ad8 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -355,7 +355,7 @@ static int wm8350_put_volsw_2r_vu(struct snd_kcontrol *kcontrol,
 			return 1;
 	}
 
-	ret = snd_soc_put_volsw_2r(kcontrol, ucontrol);
+	ret = snd_soc_put_volsw(kcontrol, ucontrol);
 	if (ret < 0)
 		return ret;
 
@@ -392,7 +392,7 @@ static int wm8350_get_volsw_2r(struct snd_kcontrol *kcontrol,
 		break;
 	}
 
-	return snd_soc_get_volsw_2r(kcontrol, ucontrol);
+	return snd_soc_get_volsw(kcontrol, ucontrol);
 }
 
 static const char *wm8350_deemp[] = { "None", "32kHz", "44.1kHz", "48kHz" };
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index 02cbf13..b256727 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -213,7 +213,7 @@ static int wm8580_out_vu(struct snd_kcontrol *kcontrol,
 	reg_cache[reg] = 0;
 	reg_cache[reg2] = 0;
 
-	ret = snd_soc_put_volsw_2r(kcontrol, ucontrol);
+	ret = snd_soc_put_volsw(kcontrol, ucontrol);
 	if (ret < 0)
 		return ret;
 
@@ -228,15 +228,15 @@ static const struct snd_kcontrol_new wm8580_snd_controls[] = {
 SOC_DOUBLE_R_EXT_TLV("DAC1 Playback Volume",
 		     WM8580_DIGITAL_ATTENUATION_DACL1,
 		     WM8580_DIGITAL_ATTENUATION_DACR1,
-		     0, 0xff, 0, snd_soc_get_volsw_2r, wm8580_out_vu, dac_tlv),
+		     0, 0xff, 0, snd_soc_get_volsw, wm8580_out_vu, dac_tlv),
 SOC_DOUBLE_R_EXT_TLV("DAC2 Playback Volume",
 		     WM8580_DIGITAL_ATTENUATION_DACL2,
 		     WM8580_DIGITAL_ATTENUATION_DACR2,
-		     0, 0xff, 0, snd_soc_get_volsw_2r, wm8580_out_vu, dac_tlv),
+		     0, 0xff, 0, snd_soc_get_volsw, wm8580_out_vu, dac_tlv),
 SOC_DOUBLE_R_EXT_TLV("DAC3 Playback Volume",
 		     WM8580_DIGITAL_ATTENUATION_DACL3,
 		     WM8580_DIGITAL_ATTENUATION_DACR3,
-		     0, 0xff, 0, snd_soc_get_volsw_2r, wm8580_out_vu, dac_tlv),
+		     0, 0xff, 0, snd_soc_get_volsw, wm8580_out_vu, dac_tlv),
 
 SOC_SINGLE("DAC1 Deemphasis Switch", WM8580_DAC_CONTROL3, 0, 1, 0),
 SOC_SINGLE("DAC2 Deemphasis Switch", WM8580_DAC_CONTROL3, 1, 1, 0),
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index f3583a5..84f33d4 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -222,7 +222,7 @@ static int wm8993_put_dc_servo(struct snd_kcontrol *kcontrol,
 	struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
 	int ret;
 
-	ret = snd_soc_put_volsw_2r(kcontrol, ucontrol);
+	ret = snd_soc_put_volsw(kcontrol, ucontrol);
 
 	/* Updating the analogue gains invalidates the DC servo cache */
 	hubs->class_w_dcs = 0;
@@ -364,7 +364,7 @@ SOC_ENUM("Speaker Mode", speaker_mode),
 
 SOC_DOUBLE_R_EXT_TLV("Headphone Volume",
 		     WM8993_LEFT_OUTPUT_VOLUME, WM8993_RIGHT_OUTPUT_VOLUME,
-		     0, 63, 0, snd_soc_get_volsw_2r, wm8993_put_dc_servo,
+		     0, 63, 0, snd_soc_get_volsw, wm8993_put_dc_servo,
 		     outpga_tlv),
 
 SOC_DOUBLE_R("Headphone Switch", WM8993_LEFT_OUTPUT_VOLUME,
-- 
1.7.7

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] ASoC: Replace remaining use of *_volsw_2r with *_volsw
  2011-10-06  6:59 ` [PATCH] ASoC: Replace remaining use of *_volsw_2r with *_volsw Peter Ujfalusi
@ 2011-10-06 10:16   ` Mark Brown
  0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2011-10-06 10:16 UTC (permalink / raw)
  To: Peter Ujfalusi
  Cc: Stephen Rothwell, Liam Girdwood, linux-next, linux-kernel, alsa-devel

On Thu, Oct 06, 2011 at 09:59:12AM +0300, Peter Ujfalusi wrote:
> The snd_soc_*_volsw_2r functionality has been merged to
> *volsw callbacks.
> Few places still used the get, or put variant of volsw_2r,
> replace those with the corresponding *_volsw.

Applied, thanks.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2011-10-06 10:16 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-06  2:22 linux-next: build failure after merge of the sound-asoc tree Stephen Rothwell
2011-10-06  4:43 ` [PATCH] ASoC: fix codec breakage caused by the volsw/volsw_2r merger Peter Ujfalusi
2011-10-06  6:59 ` [PATCH] ASoC: Replace remaining use of *_volsw_2r with *_volsw Peter Ujfalusi
2011-10-06 10:16   ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).