From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 30 Nov 2011 13:43:51 +0000 (+0000)
Subject: ASoC: Rename WM8994 detecting flag to mic_detecting
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=157a75e664f8c811c660de1d1b9abb16a1f72579;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

ASoC: Rename WM8994 detecting flag to mic_detecting

More specific and avoids confusion with a following change.

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

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 3e52d40866d2..e65745bc1003 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -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);
diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h
index 77e3d8c9eeb8..8622bc4db2fe 100644
--- a/sound/soc/codecs/wm8994.h
+++ b/sound/soc/codecs/wm8994.h
@@ -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;