extcon: arizona: Add defines for microphone detection levels

Improve readability by creating a define for each microphone detection
level.

Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

1 files changed, 14 insertions, 5 deletions

diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index a287cece0593..5775f055bd02 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -44,6 +44,15 @@
 #define HPDET_DEBOUNCE 500
 #define DEFAULT_MICD_TIMEOUT 2000
 
+#define MICD_LVL_1_TO_7 (ARIZONA_MICD_LVL_1 | ARIZONA_MICD_LVL_2 | \
+                         ARIZONA_MICD_LVL_3 | ARIZONA_MICD_LVL_4 | \
+                         ARIZONA_MICD_LVL_5 | ARIZONA_MICD_LVL_6 | \
+                         ARIZONA_MICD_LVL_7)
+
+#define MICD_LVL_0_TO_7 (ARIZONA_MICD_LVL_0 | MICD_LVL_1_TO_7)
+
+#define MICD_LVL_0_TO_8 (MICD_LVL_0_TO_7 | ARIZONA_MICD_LVL_8)
+
 struct arizona_extcon_info {
         struct device *dev;
         struct arizona *arizona;
@@ -765,7 +774,7 @@ static void arizona_micd_detect(struct work_struct *work)
 
         mutex_lock(&info->lock);
 
-        for (i = 0; i < 10 && !(val & 0x7fc); i++) {
+        for (i = 0; i < 10 && !(val & MICD_LVL_0_TO_8); i++) {
                 ret = regmap_read(arizona->regmap, ARIZONA_MIC_DETECT_3, &val);
                 if (ret != 0) {
                         dev_err(arizona->dev,
@@ -784,7 +793,7 @@ static void arizona_micd_detect(struct work_struct *work)
                 }
         }
 
-        if (i == 10 && !(val & 0x7fc)) {
+        if (i == 10 && !(val & MICD_LVL_0_TO_8)) {
                 dev_err(arizona->dev, "Failed to get valid MICDET value\n");
                 mutex_unlock(&info->lock);
                 return;
@@ -798,7 +807,7 @@ static void arizona_micd_detect(struct work_struct *work)
         }
 
         /* If we got a high impedence we should have a headset, report it. */
-        if (info->detecting && (val & 0x400)) {
+        if (info->detecting && (val & ARIZONA_MICD_LVL_8)) {
                 arizona_identify_headphone(info);
 
                 ret = extcon_update_state(&info->edev,
@@ -827,7 +836,7 @@ static void arizona_micd_detect(struct work_struct *work)
          * plain headphones.  If both polarities report a low
          * impedence then give up and report headphones.
          */
-        if (info->detecting && (val & 0x3f8)) {
+        if (info->detecting && (val & MICD_LVL_1_TO_7)) {
                 if (info->jack_flips >= info->micd_num_modes * 10) {
                         dev_dbg(arizona->dev, "Detected HP/line\n");
                         arizona_identify_headphone(info);
@@ -851,7 +860,7 @@ static void arizona_micd_detect(struct work_struct *work)
          * If we're still detecting and we detect a short then we've
          * got a headphone.  Otherwise it's a button press.
          */
-        if (val & 0x3fc) {
+        if (val & MICD_LVL_0_TO_7) {
                 if (info->mic) {
                         dev_dbg(arizona->dev, "Mic button detected\n");