extcon: arizona: Rename hpdet_ip to make its purpose clearer
authorRichard Fitzgerald <rf@opensource.wolfsonmicro.com>
Tue, 28 Apr 2015 12:34:27 +0000 (13:34 +0100)
committerChanwoo Choi <cw00.choi@samsung.com>
Tue, 19 May 2015 07:39:03 +0000 (16:39 +0900)
Renamed to hpdet_ip_version to make it clearer what it does
and that the value in it is simply a version number.

Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
drivers/extcon/extcon-arizona.c

index a0ed35b336e499e4c9e22e2cba97fa80f01287dd..830c5f94bc189ed3cced7a4dd02f93b490046f84 100644 (file)
@@ -94,7 +94,7 @@ struct arizona_extcon_info {
        bool detecting;
        int jack_flips;
 
-       int hpdet_ip;
+       int hpdet_ip_version;
 
        struct extcon_dev *edev;
 };
@@ -380,7 +380,7 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info)
                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",
@@ -441,7 +441,7 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info)
 
        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",
@@ -1161,7 +1161,7 @@ static int arizona_extcon_probe(struct platform_device *pdev)
                        break;
                default:
                        info->micd_clamp = true;
-                       info->hpdet_ip = 1;
+                       info->hpdet_ip_version = 1;
                        break;
                }
                break;
@@ -1172,7 +1172,7 @@ static int arizona_extcon_probe(struct platform_device *pdev)
                        break;
                default:
                        info->micd_clamp = true;
-                       info->hpdet_ip = 2;
+                       info->hpdet_ip_version = 2;
                        break;
                }
                break;