aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxiangxiao2014-02-23 14:40:44 +0800
committerMark Brown2014-02-24 10:27:44 +0900
commitcb29d7b9ef7faf95e27d90362a5e7694c5479093 (patch)
treefe51f47d477c2a723392a7e5a0e041dc9853516e
parent38dbfb59d1175ef458d006556061adeaa8751b72 (diff)
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>
-rw-r--r--include/sound/soc.h3
-rw-r--r--sound/soc/soc-jack.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 9a001472b96a..266c188cc36f 100644
--- a/include/sound/soc.h
+++ b/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 {
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 23d43dac91da..720060286d19 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);
}