extcon: arizona: Deobfuscate arizona_extcon_do_magic

arizona_extcon_do_magic does not lend a lot of clarity to the purpose
of the function, and as all the registers used are described in the
datasheet there is no need to obfuscate the code. This patch renames the
function to arizona_extcon_hp_clamp, as it controls clamping on the
headphone output.

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

1 files changed, 20 insertions, 16 deletions

diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index 63f01c42aed4..95cf7f875bb3 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -136,18 +136,22 @@ static const char *arizona_cable[] = {
 
 static void arizona_start_hpdet_acc_id(struct arizona_extcon_info *info);
 
-static void arizona_extcon_do_magic(struct arizona_extcon_info *info,
-                                    unsigned int magic)
+static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info,
+                                    bool clamp)
 {
         struct arizona *arizona = info->arizona;
+        unsigned int val = 0;
         int ret;
 
+        if (clamp)
+                val = ARIZONA_RMV_SHRT_HP1L;
+
         mutex_lock(&arizona->dapm->card->dapm_mutex);
 
-        arizona->hpdet_magic = magic;
+        arizona->hpdet_clamp = clamp;
 
-        /* Keep the HP output stages disabled while doing the magic */
-        if (magic) {
+        /* Keep the HP output stages disabled while doing the clamp */
+        if (clamp) {
                 ret = regmap_update_bits(arizona->regmap,
                                          ARIZONA_OUTPUT_ENABLES_1,
                                          ARIZONA_OUT1L_ENA |
@@ -158,20 +162,20 @@ static void arizona_extcon_do_magic(struct arizona_extcon_info *info,
                                  ret);
         }
 
-        ret = regmap_update_bits(arizona->regmap, 0x225, 0x4000,
-                                 magic);
+        ret = regmap_update_bits(arizona->regmap, ARIZONA_HP_CTRL_1L,
+                                 ARIZONA_RMV_SHRT_HP1L, val);
         if (ret != 0)
-                dev_warn(arizona->dev, "Failed to do magic: %d\n",
+                dev_warn(arizona->dev, "Failed to do clamp: %d\n",
                                  ret);
 
-        ret = regmap_update_bits(arizona->regmap, 0x226, 0x4000,
-                                 magic);
+        ret = regmap_update_bits(arizona->regmap, ARIZONA_HP_CTRL_1R,
+                                 ARIZONA_RMV_SHRT_HP1R, val);
         if (ret != 0)
-                dev_warn(arizona->dev, "Failed to do magic: %d\n",
+                dev_warn(arizona->dev, "Failed to do clamp: %d\n",
                          ret);
 
-        /* Restore the desired state while not doing the magic */
-        if (!magic) {
+        /* Restore the desired state while not doing the clamp */
+        if (!clamp) {
                 ret = regmap_update_bits(arizona->regmap,
                                          ARIZONA_OUTPUT_ENABLES_1,
                                          ARIZONA_OUT1L_ENA |
@@ -603,7 +607,7 @@ done:
                            ARIZONA_HP_IMPEDANCE_RANGE_MASK | ARIZONA_HP_POLL,
                            0);
 
-        arizona_extcon_do_magic(info, 0);
+        arizona_extcon_hp_clamp(info, false);
 
         if (id_gpio)
                 gpio_set_value_cansleep(id_gpio, 0);
@@ -648,7 +652,7 @@ static void arizona_identify_headphone(struct arizona_extcon_info *info)
         if (info->mic)
                 arizona_stop_mic(info);
 
-        arizona_extcon_do_magic(info, 0x4000);
+        arizona_extcon_hp_clamp(info, true);
 
         ret = regmap_update_bits(arizona->regmap,
                                  ARIZONA_ACCESSORY_DETECT_MODE_1,
@@ -699,7 +703,7 @@ static void arizona_start_hpdet_acc_id(struct arizona_extcon_info *info)
 
         info->hpdet_active = true;
 
-        arizona_extcon_do_magic(info, 0x4000);
+        arizona_extcon_hp_clamp(info, true);
 
         ret = regmap_update_bits(arizona->regmap,
                                  ARIZONA_ACCESSORY_DETECT_MODE_1,