Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1435b940 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: ifdef out trace points from modules for x86 



No idea why this works on ARM but not x86.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 6a504a75

sound/soc/codecs/88pm860x-codec.c

+2 −0
Original line number Diff line number Diff line
@@ -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))

sound/soc/codecs/wm8350.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

sound/soc/codecs/wm8903.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

sound/soc/codecs/wm8962.c

+2 −0
Original line number Diff line number Diff line
@@ -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);