public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Peter Ujfalusi <peter.ujfalusi@ti•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
	Mark Brown <broonie@opensource•wolfsonmicro.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Peter Ujfalusi <peter.ujfalusi@ti•com>
Subject: [PATCH] ASoC: fix codec breakage caused by the volsw/volsw_2r merger
Date: Thu,  6 Oct 2011 07:43:21 +0300	[thread overview]
Message-ID: <1317876201-7041-1-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <20111006132204.29c84ed7349daf8c4aa39c3b@canb.auug.org.au>

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

  reply	other threads:[~2011-10-06  4:43 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
2011-10-06  6:59 ` [PATCH] ASoC: Replace remaining use of *_volsw_2r with *_volsw Peter Ujfalusi
2011-10-06 10:16   ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1317876201-7041-1-git-send-email-peter.ujfalusi@ti.com \
    --to=peter.ujfalusi@ti$(echo .)com \
    --cc=broonie@opensource$(echo .)wolfsonmicro.com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox