Commit 157a75e6 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Rename WM8994 detecting flag to mic_detecting 



More specific and avoids confusion with a following change.

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

sound/soc/codecs/wm8994.c

+6 −6
Original line number Diff line number Diff line
@@ -3051,7 +3051,7 @@ static void wm8958_default_micdet(u16 status, void *data) 
	if (!(status & WM8958_MICD_STS)) {

		dev_dbg(codec->dev, "Detected open circuit\n");

		wm8994->jack_mic = false;

		wm8994->detecting = true;

		wm8994->mic_detecting = true;



		wm8958_micd_set_rate(codec);
@@ -3064,10 +3064,10 @@ static void wm8958_default_micdet(u16 status, void *data) 
	/* If the measurement is showing a high impedence we've got a

	 * microphone.

	 */

	if (wm8994->detecting && (status & 0x600)) {

	if (wm8994->mic_detecting && (status & 0x600)) {

		dev_dbg(codec->dev, "Detected microphone\n");



		wm8994->detecting = false;

		wm8994->mic_detecting = false;

		wm8994->jack_mic = true;



		wm8958_micd_set_rate(codec);
@@ -3077,9 +3077,9 @@ static void wm8958_default_micdet(u16 status, void *data) 
	}





	if (wm8994->detecting && status & 0x4) {

	if (wm8994->mic_detecting && status & 0x4) {

		dev_dbg(codec->dev, "Detected headphone\n");

		wm8994->detecting = false;

		wm8994->mic_detecting = false;



		wm8958_micd_set_rate(codec);
@@ -3157,7 +3157,7 @@ int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, 
		wm8994->jack_cb = cb;

		wm8994->jack_cb_data = cb_data;



		wm8994->detecting = true;

		wm8994->mic_detecting = true;

		wm8994->jack_mic = false;



		wm8958_micd_set_rate(codec);

sound/soc/codecs/wm8994.h

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ struct wm8994_priv { 
	struct soc_enum enh_eq_enum;



	struct wm8994_micdet micdet[2];

	bool detecting;

	bool mic_detecting;

	bool jack_mic;

	int btn_mask;