Commit 3dfa743d authored by Charles Keepax's avatar Charles Keepax Committed by Chanwoo Choi

extcon: arizona: Invert logic of check in arizona_hpdet_do_id

Invert the check of hpdet_acc_id at the top of arizona_hpdet_do_id to
reduce the identation within the function.
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent 8267ebcc
...@@ -533,67 +533,65 @@ static int arizona_hpdet_do_id(struct arizona_extcon_info *info, int *reading, ...@@ -533,67 +533,65 @@ static int arizona_hpdet_do_id(struct arizona_extcon_info *info, int *reading,
struct arizona *arizona = info->arizona; struct arizona *arizona = info->arizona;
int id_gpio = arizona->pdata.hpdet_id_gpio; int id_gpio = arizona->pdata.hpdet_id_gpio;
if (!arizona->pdata.hpdet_acc_id)
return 0;
/* /*
* If we're using HPDET for accessory identification we need * If we're using HPDET for accessory identification we need
* to take multiple measurements, step through them in sequence. * to take multiple measurements, step through them in sequence.
*/ */
if (arizona->pdata.hpdet_acc_id) { info->hpdet_res[info->num_hpdet_res++] = *reading;
info->hpdet_res[info->num_hpdet_res++] = *reading;
/* Only check the mic directly if we didn't already ID it */ /* Only check the mic directly if we didn't already ID it */
if (id_gpio && info->num_hpdet_res == 1) { if (id_gpio && info->num_hpdet_res == 1) {
dev_dbg(arizona->dev, "Measuring mic\n"); dev_dbg(arizona->dev, "Measuring mic\n");
regmap_update_bits(arizona->regmap,
ARIZONA_ACCESSORY_DETECT_MODE_1,
ARIZONA_ACCDET_MODE_MASK |
ARIZONA_ACCDET_SRC,
ARIZONA_ACCDET_MODE_HPR |
info->micd_modes[0].src);
gpio_set_value_cansleep(id_gpio, 1); regmap_update_bits(arizona->regmap,
ARIZONA_ACCESSORY_DETECT_MODE_1,
ARIZONA_ACCDET_MODE_MASK |
ARIZONA_ACCDET_SRC,
ARIZONA_ACCDET_MODE_HPR |
info->micd_modes[0].src);
regmap_update_bits(arizona->regmap, gpio_set_value_cansleep(id_gpio, 1);
ARIZONA_HEADPHONE_DETECT_1,
ARIZONA_HP_POLL, ARIZONA_HP_POLL);
return -EAGAIN;
}
/* OK, got both. Now, compare... */ regmap_update_bits(arizona->regmap, ARIZONA_HEADPHONE_DETECT_1,
dev_dbg(arizona->dev, "HPDET measured %d %d\n", ARIZONA_HP_POLL, ARIZONA_HP_POLL);
info->hpdet_res[0], info->hpdet_res[1]); return -EAGAIN;
}
/* Take the headphone impedance for the main report */ /* OK, got both. Now, compare... */
*reading = info->hpdet_res[0]; dev_dbg(arizona->dev, "HPDET measured %d %d\n",
info->hpdet_res[0], info->hpdet_res[1]);
/* Sometimes we get false readings due to slow insert */ /* Take the headphone impedance for the main report */
if (*reading >= ARIZONA_HPDET_MAX && !info->hpdet_retried) { *reading = info->hpdet_res[0];
dev_dbg(arizona->dev, "Retrying high impedance\n");
info->num_hpdet_res = 0;
info->hpdet_retried = true;
arizona_start_hpdet_acc_id(info);
pm_runtime_put(info->dev);
return -EAGAIN;
}
/* /* Sometimes we get false readings due to slow insert */
* If we measure the mic as high impedance if (*reading >= ARIZONA_HPDET_MAX && !info->hpdet_retried) {
*/ dev_dbg(arizona->dev, "Retrying high impedance\n");
if (!id_gpio || info->hpdet_res[1] > 50) { info->num_hpdet_res = 0;
dev_dbg(arizona->dev, "Detected mic\n"); info->hpdet_retried = true;
*mic = true; arizona_start_hpdet_acc_id(info);
info->detecting = true; pm_runtime_put(info->dev);
} else { return -EAGAIN;
dev_dbg(arizona->dev, "Detected headphone\n"); }
}
/* Make sure everything is reset back to the real polarity */ /*
regmap_update_bits(arizona->regmap, * If we measure the mic as high impedance
ARIZONA_ACCESSORY_DETECT_MODE_1, */
ARIZONA_ACCDET_SRC, if (!id_gpio || info->hpdet_res[1] > 50) {
info->micd_modes[0].src); dev_dbg(arizona->dev, "Detected mic\n");
*mic = true;
info->detecting = true;
} else {
dev_dbg(arizona->dev, "Detected headphone\n");
} }
/* Make sure everything is reset back to the real polarity */
regmap_update_bits(arizona->regmap, ARIZONA_ACCESSORY_DETECT_MODE_1,
ARIZONA_ACCDET_SRC, info->micd_modes[0].src);
return 0; return 0;
} }
......
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