From 4fc6e2ef3221c9574906f30c9e74907ac6d32ce5 Mon Sep 17 00:00:00 2001 From: Jinsu Park Date: Mon, 28 Oct 2019 13:25:01 +0900 Subject: [PATCH] [RAMEN9610-20768][9610] s2mu106_usbpd delete deadcode Change-Id: I2bac68122656f6f5276ff9dc4fb995eda15d4be3 Signed-off-by: Jinsu Park --- drivers/ccic/s2mu106-usbpd.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/drivers/ccic/s2mu106-usbpd.c b/drivers/ccic/s2mu106-usbpd.c index 54e51ff46287..bd9312189308 100644 --- a/drivers/ccic/s2mu106-usbpd.c +++ b/drivers/ccic/s2mu106-usbpd.c @@ -317,28 +317,22 @@ static int s2mu106_usbpd_get_pmeter_current(struct s2mu106_usbpd_data *pdic_data static int s2mu106_usbpd_check_vbus(struct s2mu106_usbpd_data *pdic_data, int volt, CCIC_VBUS_SEL mode) { - int delay = 20; - int retry = 100; - int i = 0; int ret = 0; if (mode == VBUS_OFF) { - for (i = 0; i < retry; i++) { - ret = s2mu106_usbpd_get_pmeter_volt(pdic_data); - if (ret < 0) - return ret; - - if (pdic_data->pm_chgin < volt) { - pr_info("%s chgin volt(%d) finish!\n", __func__, - pdic_data->pm_chgin); - return true; - } else { - pr_info("%s chgin volt(%d) waiting 400ms!\n", - __func__, pdic_data->pm_chgin); - msleep(400); - return true; - } - msleep(delay); + ret = s2mu106_usbpd_get_pmeter_volt(pdic_data); + if (ret < 0) + return ret; + + if (pdic_data->pm_chgin < volt) { + pr_info("%s chgin volt(%d) finish!\n", __func__, + pdic_data->pm_chgin); + return true; + } else { + pr_info("%s chgin volt(%d) waiting 400ms!\n", + __func__, pdic_data->pm_chgin); + msleep(400); + return true; } } else if (mode == VBUS_ON) { ret = s2mu106_usbpd_get_pmeter_volt(pdic_data); -- 2.20.1