diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-29 13:05:21 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-29 13:06:18 +0000 |
| commit | 7116f452c8e3e38f99ab3231a758eb366dacfe4a (patch) | |
| tree | 0f49e256fc6aa4052292442b310cce427ef5a317 | |
| parent | 22a756ee8951e597c76e5a60f81d40a43054489e (diff) | |
| download | linux-3.10-7116f452c8e3e38f99ab3231a758eb366dacfe4a.tar.gz linux-3.10-7116f452c8e3e38f99ab3231a758eb366dacfe4a.tar.bz2 linux-3.10-7116f452c8e3e38f99ab3231a758eb366dacfe4a.zip | |
ASoC: Yet more x86 tracepoint workarounds
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | sound/soc/codecs/88pm860x-codec.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8350.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c index 5da8207a696..06b6981b8d6 100644 --- a/sound/soc/codecs/88pm860x-codec.c +++ b/sound/soc/codecs/88pm860x-codec.c @@ -1262,7 +1262,7 @@ static irqreturn_t pm860x_codec_handler(int irq, void *data) mask = pm860x->det.hs_shrt | pm860x->det.hook_det | pm860x->det.lo_shrt | pm860x->det.hp_det; -#ifndef CONFIG_SND_SOC_88PM860X +#ifndef CONFIG_SND_SOC_88PM860X_MODULE if (status & (HEADSET_STATUS | MIC_STATUS | SHORT_HS1 | SHORT_HS2 | SHORT_LO1 | SHORT_LO2)) trace_snd_soc_jack_irq(dev_name(pm860x->codec->dev)); diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index db07137bf3b..6d6dc9efe91 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c @@ -1463,7 +1463,9 @@ static irqreturn_t wm8350_mic_handler(int irq, void *data) u16 reg; int report = 0; +#ifndef CONFIG_SND_SOC_WM8350_MODULE trace_snd_soc_jack_irq("WM8350 mic"); +#endif reg = wm8350_reg_read(wm8350, WM8350_JACK_PIN_STATUS); if (reg & WM8350_JACK_MICSCD_LVL) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 067a532bed1..247a6a99feb 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -2756,7 +2756,9 @@ static irqreturn_t wm8994_mic_irq(int irq, void *data) int reg; int report; +#ifndef CONFIG_SND_SOC_WM8994_MODULE trace_snd_soc_jack_irq(dev_name(codec->dev)); +#endif reg = snd_soc_read(codec, WM8994_INTERRUPT_RAW_STATUS_2); if (reg < 0) { @@ -2904,7 +2906,9 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) goto out; } +#ifndef CONFIG_SND_SOC_WM8994_MODULE trace_snd_soc_jack_irq(dev_name(codec->dev)); +#endif if (wm8994->jack_cb) wm8994->jack_cb(reg, wm8994->jack_cb_data); |