bool detecting;
        int jack_flips;
 
-       int hpdet_ip;
+       int hpdet_ip_version;
 
        struct extcon_dev *edev;
 };
                return ret;
        }
 
-       switch (info->hpdet_ip) {
+       switch (info->hpdet_ip_version) {
        case 0:
                if (!(val & ARIZONA_HP_DONE)) {
                        dev_err(arizona->dev, "HPDET did not complete: %x\n",
 
        default:
                dev_warn(arizona->dev, "Unknown HPDET IP revision %d\n",
-                        info->hpdet_ip);
+                        info->hpdet_ip_version);
        case 2:
                if (!(val & ARIZONA_HP_DONE_B)) {
                        dev_err(arizona->dev, "HPDET did not complete: %x\n",
                        break;
                default:
                        info->micd_clamp = true;
-                       info->hpdet_ip = 1;
+                       info->hpdet_ip_version = 1;
                        break;
                }
                break;
                        break;
                default:
                        info->micd_clamp = true;
-                       info->hpdet_ip = 2;
+                       info->hpdet_ip_version = 2;
                        break;
                }
                break;