4 files changed, 10 insertions, 0 deletions

diff --git a/sound/soc/codecs/88pm860x-codec.c b/sound/soc/codecs/88pm860x-codec.c
index a34fb924e77b..3e798a12ee3d 100644
--- 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 82d877df3fb0..db07137bf3b9 100644
--- 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 b32699bc1927..02de5ae42d63 100644
--- 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 a24f83d604c9..b311b465c4d8 100644
--- 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);