Commit 7116f452 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Yet more x86 tracepoint workarounds 



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

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

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

sound/soc/codecs/wm8350.c

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

sound/soc/codecs/wm8994.c

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