aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/extcon/extcon-arizona.c
diff options
context:
space:
mode:
authorRichard Fitzgerald <rf@opensource.wolfsonmicro.com>2015-04-28 08:34:27 -0400
committerChanwoo Choi <cw00.choi@samsung.com>2015-05-19 03:39:03 -0400
commitd0fd5fbc09b17e26408f7e3db22511b57f6bf22e (patch)
tree76f0f19294fd5b166b4fb536b3d1435da963116f /drivers/extcon/extcon-arizona.c
parented2c0604ace93a2c9b8fc055ab61fff68704cd1e (diff)
extcon: arizona: Rename hpdet_ip to make its purpose clearer
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>
Diffstat (limited to 'drivers/extcon/extcon-arizona.c')
-rw-r--r--drivers/extcon/extcon-arizona.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index a0ed35b336e4..830c5f94bc18 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -94,7 +94,7 @@ struct arizona_extcon_info {
94 bool detecting; 94 bool detecting;
95 int jack_flips; 95 int jack_flips;
96 96
97 int hpdet_ip; 97 int hpdet_ip_version;
98 98
99 struct extcon_dev *edev; 99 struct extcon_dev *edev;
100}; 100};
@@ -380,7 +380,7 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info)
380 return ret; 380 return ret;
381 } 381 }
382 382
383 switch (info->hpdet_ip) { 383 switch (info->hpdet_ip_version) {
384 case 0: 384 case 0:
385 if (!(val & ARIZONA_HP_DONE)) { 385 if (!(val & ARIZONA_HP_DONE)) {
386 dev_err(arizona->dev, "HPDET did not complete: %x\n", 386 dev_err(arizona->dev, "HPDET did not complete: %x\n",
@@ -441,7 +441,7 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info)
441 441
442 default: 442 default:
443 dev_warn(arizona->dev, "Unknown HPDET IP revision %d\n", 443 dev_warn(arizona->dev, "Unknown HPDET IP revision %d\n",
444 info->hpdet_ip); 444 info->hpdet_ip_version);
445 case 2: 445 case 2:
446 if (!(val & ARIZONA_HP_DONE_B)) { 446 if (!(val & ARIZONA_HP_DONE_B)) {
447 dev_err(arizona->dev, "HPDET did not complete: %x\n", 447 dev_err(arizona->dev, "HPDET did not complete: %x\n",
@@ -1161,7 +1161,7 @@ static int arizona_extcon_probe(struct platform_device *pdev)
1161 break; 1161 break;
1162 default: 1162 default:
1163 info->micd_clamp = true; 1163 info->micd_clamp = true;
1164 info->hpdet_ip = 1; 1164 info->hpdet_ip_version = 1;
1165 break; 1165 break;
1166 } 1166 }
1167 break; 1167 break;
@@ -1172,7 +1172,7 @@ static int arizona_extcon_probe(struct platform_device *pdev)
1172 break; 1172 break;
1173 default: 1173 default:
1174 info->micd_clamp = true; 1174 info->micd_clamp = true;
1175 info->hpdet_ip = 2; 1175 info->hpdet_ip_version = 2;
1176 break; 1176 break;
1177 } 1177 }
1178 break; 1178 break;