forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
ed2c0604ac
commit
d0fd5fbc09
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user