diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-30 08:43:51 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-01 09:21:53 -0500 |
commit | 157a75e664f8c811c660de1d1b9abb16a1f72579 (patch) | |
tree | a012b78a4d4fe63db3dbf2a9032e7fb0c393f89c /sound/soc | |
parent | 4585790d1cde32a5719c24412e9845e031358e08 (diff) |
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>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/wm8994.c | 12 | ||||
-rw-r--r-- | sound/soc/codecs/wm8994.h | 2 |
2 files changed, 7 insertions, 7 deletions
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) | |||
3051 | if (!(status & WM8958_MICD_STS)) { | 3051 | if (!(status & WM8958_MICD_STS)) { |
3052 | dev_dbg(codec->dev, "Detected open circuit\n"); | 3052 | dev_dbg(codec->dev, "Detected open circuit\n"); |
3053 | wm8994->jack_mic = false; | 3053 | wm8994->jack_mic = false; |
3054 | wm8994->detecting = true; | 3054 | wm8994->mic_detecting = true; |
3055 | 3055 | ||
3056 | wm8958_micd_set_rate(codec); | 3056 | wm8958_micd_set_rate(codec); |
3057 | 3057 | ||
@@ -3064,10 +3064,10 @@ static void wm8958_default_micdet(u16 status, void *data) | |||
3064 | /* If the measurement is showing a high impedence we've got a | 3064 | /* If the measurement is showing a high impedence we've got a |
3065 | * microphone. | 3065 | * microphone. |
3066 | */ | 3066 | */ |
3067 | if (wm8994->detecting && (status & 0x600)) { | 3067 | if (wm8994->mic_detecting && (status & 0x600)) { |
3068 | dev_dbg(codec->dev, "Detected microphone\n"); | 3068 | dev_dbg(codec->dev, "Detected microphone\n"); |
3069 | 3069 | ||
3070 | wm8994->detecting = false; | 3070 | wm8994->mic_detecting = false; |
3071 | wm8994->jack_mic = true; | 3071 | wm8994->jack_mic = true; |
3072 | 3072 | ||
3073 | wm8958_micd_set_rate(codec); | 3073 | wm8958_micd_set_rate(codec); |
@@ -3077,9 +3077,9 @@ static void wm8958_default_micdet(u16 status, void *data) | |||
3077 | } | 3077 | } |
3078 | 3078 | ||
3079 | 3079 | ||
3080 | if (wm8994->detecting && status & 0x4) { | 3080 | if (wm8994->mic_detecting && status & 0x4) { |
3081 | dev_dbg(codec->dev, "Detected headphone\n"); | 3081 | dev_dbg(codec->dev, "Detected headphone\n"); |
3082 | wm8994->detecting = false; | 3082 | wm8994->mic_detecting = false; |
3083 | 3083 | ||
3084 | wm8958_micd_set_rate(codec); | 3084 | wm8958_micd_set_rate(codec); |
3085 | 3085 | ||
@@ -3157,7 +3157,7 @@ int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, | |||
3157 | wm8994->jack_cb = cb; | 3157 | wm8994->jack_cb = cb; |
3158 | wm8994->jack_cb_data = cb_data; | 3158 | wm8994->jack_cb_data = cb_data; |
3159 | 3159 | ||
3160 | wm8994->detecting = true; | 3160 | wm8994->mic_detecting = true; |
3161 | wm8994->jack_mic = false; | 3161 | wm8994->jack_mic = false; |
3162 | 3162 | ||
3163 | wm8958_micd_set_rate(codec); | 3163 | 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 { | |||
127 | struct soc_enum enh_eq_enum; | 127 | struct soc_enum enh_eq_enum; |
128 | 128 | ||
129 | struct wm8994_micdet micdet[2]; | 129 | struct wm8994_micdet micdet[2]; |
130 | bool detecting; | 130 | bool mic_detecting; |
131 | bool jack_mic; | 131 | bool jack_mic; |
132 | int btn_mask; | 132 | int btn_mask; |
133 | 133 | ||