Commit d0fd5fbc authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Chanwoo Choi

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: default avatarRichard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent ed2c0604
...@@ -94,7 +94,7 @@ struct arizona_extcon_info { ...@@ -94,7 +94,7 @@ struct arizona_extcon_info {
bool detecting; bool detecting;
int jack_flips; int jack_flips;
int hpdet_ip; int hpdet_ip_version;
struct extcon_dev *edev; struct extcon_dev *edev;
}; };
...@@ -380,7 +380,7 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info) ...@@ -380,7 +380,7 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info)
return ret; return ret;
} }
switch (info->hpdet_ip) { switch (info->hpdet_ip_version) {
case 0: case 0:
if (!(val & ARIZONA_HP_DONE)) { if (!(val & ARIZONA_HP_DONE)) {
dev_err(arizona->dev, "HPDET did not complete: %x\n", 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,7 +441,7 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info)
default: default:
dev_warn(arizona->dev, "Unknown HPDET IP revision %d\n", dev_warn(arizona->dev, "Unknown HPDET IP revision %d\n",
info->hpdet_ip); info->hpdet_ip_version);
case 2: case 2:
if (!(val & ARIZONA_HP_DONE_B)) { if (!(val & ARIZONA_HP_DONE_B)) {
dev_err(arizona->dev, "HPDET did not complete: %x\n", dev_err(arizona->dev, "HPDET did not complete: %x\n",
...@@ -1161,7 +1161,7 @@ static int arizona_extcon_probe(struct platform_device *pdev) ...@@ -1161,7 +1161,7 @@ static int arizona_extcon_probe(struct platform_device *pdev)
break; break;
default: default:
info->micd_clamp = true; info->micd_clamp = true;
info->hpdet_ip = 1; info->hpdet_ip_version = 1;
break; break;
} }
break; break;
...@@ -1172,7 +1172,7 @@ static int arizona_extcon_probe(struct platform_device *pdev) ...@@ -1172,7 +1172,7 @@ static int arizona_extcon_probe(struct platform_device *pdev)
break; break;
default: default:
info->micd_clamp = true; info->micd_clamp = true;
info->hpdet_ip = 2; info->hpdet_ip_version = 2;
break; break;
} }
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment