diff mbox

ASoC: add data field into snd_soc_jack_gpio

Message ID 1393137644-20955-1-git-send-email-xiaoxiang@xiaomi.com (mailing list archive)
State Accepted
Commit cb29d7b9ef7faf95e27d90362a5e7694c5479093
Headers show

Commit Message

Xiang Xiao Feb. 23, 2014, 6:40 a.m. UTC 
so callback could get the context data as needed

Change-Id: I5542613ccf9881deb672e71d0f0c4f603ad761fd
Signed-off-by: xiangxiao <xiaoxiang@xiaomi.com>
---
 include/sound/soc.h  | 3 ++-
 sound/soc/soc-jack.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

Comments

Mark Brown Feb. 24, 2014, 1:28 a.m. UTC | #1 
On Sun, Feb 23, 2014 at 02:40:44PM +0800, xiangxiao wrote:
> so callback could get the context data as needed

> Change-Id: I5542613ccf9881deb672e71d0f0c4f603ad761fd

Applied, thanks, but as I said for your previous version of this
upstream submissions shouldn't have Change-Id, that is to do with your
internal review system.
Takashi Iwai Feb. 24, 2014, 9:26 a.m. UTC | #2 
At Mon, 24 Feb 2014 10:28:40 +0900,
Mark Brown wrote:
> 
> On Sun, Feb 23, 2014 at 02:40:44PM +0800, xiangxiao wrote:
> > so callback could get the context data as needed
> 
> > Change-Id: I5542613ccf9881deb672e71d0f0c4f603ad761fd
> 
> Applied, thanks, but as I said for your previous version of this
> upstream submissions shouldn't have Change-Id, that is to do with your
> internal review system.

Yep, also please write your name in sign-off line in a standard way
at the next time, too (usually either "Firstname Surname <mail>").


Takashi
diff mbox

Patch

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 21038e0..a789a29 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -613,7 +613,8 @@  struct snd_soc_jack_gpio {
 	struct snd_soc_jack *jack;
 	struct delayed_work work;
 
-	int (*jack_status_check)(void);
+	void *data;
+	int (*jack_status_check)(void *data);
 };
 
 struct snd_soc_jack {
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index b12fce6..b903f82 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -250,7 +250,7 @@  static void snd_soc_jack_gpio_detect(struct snd_soc_jack_gpio *gpio)
 		report = 0;
 
 	if (gpio->jack_status_check)
-		report = gpio->jack_status_check();
+		report = gpio->jack_status_check(gpio->data);
 
 	snd_soc_jack_report(jack, report, gpio->report);
 }