Browse Source

ASoC: add data field into snd_soc_jack_gpio

so callback could get the context data as needed

Signed-off-by: xiangxiao <xiaoxiang@xiaomi.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
xiangxiao 11 years ago
parent
commit
cb29d7b9ef
2 changed files with 3 additions and 2 deletions
  1. 2 1
      include/sound/soc.h
  2. 1 1
      sound/soc/soc-jack.c

+ 2 - 1
include/sound/soc.h

@@ -600,7 +600,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 {

+ 1 - 1
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);
 }