ASoC: ifdef out trace points from modules for x86

No idea why this works on ARM but not x86.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c
index a34fb924e77b6425637f35375a9bcc9c02350dad..3e798a12ee3d26fa86895bb9b98c184aba08a9c5 100644 (file)
--- a/sound/soc/codecs/88pm860x-codec.c
+++ b/sound/soc/codecs/88pm860x-codec.c
@@ -1263,9 +1263,11 @@ 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
        if (status & (HEADSET_STATUS | MIC_STATUS | SHORT_HS1 | SHORT_HS2 |
                      SHORT_LO1 | SHORT_LO2))
                trace_snd_soc_jack_irq(dev_name(pm860x->codec->dev));
+#endif
 
        if ((pm860x->det.hp_det & SND_JACK_HEADPHONE)
                && (status & HEADSET_STATUS))

diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 82d877df3fb0e323d6fc26495bd6f99a4c1eb55b..db07137bf3b9d7bf1d67f77720d14f75cbcbb8c6 100644 (file)
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -1379,12 +1379,16 @@ static irqreturn_t wm8350_hp_jack_handler(int irq, void *data)
 
        switch (irq - wm8350->irq_base) {
        case WM8350_IRQ_CODEC_JCK_DET_L:
+#ifndef CONFIG_SND_SOC_WM8350_MODULE
                trace_snd_soc_jack_irq("WM8350 HPL");
+#endif
                jack = &priv->hpl;
                break;
 
        case WM8350_IRQ_CODEC_JCK_DET_R:
+#ifndef CONFIG_SND_SOC_WM8350_MODULE
                trace_snd_soc_jack_irq("WM8350 HPR");
+#endif
                jack = &priv->hpr;
                break;
 

diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index b32699bc1927f93f527cd18b7df7151d98d1d9cc..02de5ae42d6386682a0a00d008683d7f7ffef4db 100644 (file)
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -1534,8 +1534,10 @@ static irqreturn_t wm8903_irq(int irq, void *data)
        mic_report = wm8903->mic_last_report;
        int_pol = snd_soc_read(codec, WM8903_INTERRUPT_POLARITY_1);
 
+#ifndef CONFIG_SND_SOC_WM8903_MODULE
        if (int_val & (WM8903_MICSHRT_EINT | WM8903_MICDET_EINT))
                trace_snd_soc_jack_irq(dev_name(codec->dev));
+#endif
 
        if (int_val & WM8903_MICSHRT_EINT) {
                dev_dbg(codec->dev, "Microphone short (pol=%x)\n", int_pol);

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index a24f83d604c91fd5794d3db817517d86210df98e..b311b465c4d8a241e3e881eaac2cd96082a355e0 100644 (file)
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3354,7 +3354,9 @@ static irqreturn_t wm8962_irq(int irq, void *data)
        if (active & (WM8962_MICSCD_EINT | WM8962_MICD_EINT)) {
                dev_dbg(codec->dev, "Microphone event detected\n");
 
+#ifndef CONFIG_SOUND_SOC_WM862_MODULE
                trace_snd_soc_jack_irq(dev_name(codec->dev));
+#endif
 
                pm_wakeup_event(codec->dev, 300);