From e15fbca94d471ef07e6bd4d1f96905ae7e5231a1 Mon Sep 17 00:00:00 2001 From: chailu1 Date: Fri, 9 Jul 2021 10:38:28 +0800 Subject: [PATCH] cp: improve 8549 read status register While update status register remove "if" judge. so the relust could is true or false. otherwise only true. Change-Id: Ie4961fd19c1eeaf10308a5b518020d3ee697d2d5 Reviewed-on: https://gerrit.mot.com/2007602 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Haijian Ma Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- drivers/power/mmi_sc8549/mmi_sc8549.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/power/mmi_sc8549/mmi_sc8549.c b/drivers/power/mmi_sc8549/mmi_sc8549.c index e97e9fc55117..9b96ef3e3b8c 100644 --- a/drivers/power/mmi_sc8549/mmi_sc8549.c +++ b/drivers/power/mmi_sc8549/mmi_sc8549.c @@ -1220,28 +1220,23 @@ static void sc8549_check_fault_status(struct sc8549 *sc) mutex_lock(&sc->data_lock); ret = sc8549_read_byte(sc, SC8549_REG_02, &stat); - if (!ret && (stat & (SC8549_AC_OVP_STAT_MASK | SC8549_AC_OVP_FLAG_MASK))) { + if (!ret) { sc_err("VAC_STAT = 0x%02X\n", stat); - if (stat & SC8549_AC_OVP_FLAG_MASK) - sc->ac_ovp_fault = !!(stat & SC8549_AC_OVP_FLAG_MASK); + sc->ac_ovp_fault = !!(stat & (SC8549_AC_OVP_STAT_MASK | SC8549_AC_OVP_FLAG_MASK)); } ret = sc8549_read_byte(sc, SC8549_REG_03, &stat); - if (!ret && (stat & (SC8549_VDROP_OVP_STAT_MASK | SC8549_VDROP_OVP_FLAG_MASK))) { + if (!ret) { sc_err("VDROP_STAT = 0x%02X\n", stat); - if (stat & SC8549_VDROP_OVP_FLAG_MASK) - sc->drop_ovp_fault = !!(stat & SC8549_VDROP_OVP_FLAG_MASK); + sc->drop_ovp_fault = !!(stat & (SC8549_VDROP_OVP_STAT_MASK | SC8549_VDROP_OVP_FLAG_MASK)); } ret = sc8549_read_byte(sc, SC8549_REG_06, &stat); - if (!ret && stat) { + if (!ret) { sc_err("REG06_STAT = 0x%02X\n", stat); - if (stat & SC8549_TSHUT_FLAG_MASK) - sc->ts_shut_fault = !!(stat & SC8549_TSHUT_FLAG_MASK); - if (stat & SC8549_SS_TIMEOUT_FLAG_MASK) - sc->ss_timeout_fault = !!(stat & SC8549_SS_TIMEOUT_FLAG_MASK); - if (stat & SC8549_CONV_SWITCHING_STAT_MASK) - sc->cp_switch = !!(stat & SC8549_CONV_SWITCHING_STAT_MASK); + sc->ts_shut_fault = !!(stat & SC8549_TSHUT_FLAG_MASK); + sc->ss_timeout_fault = !!(stat & SC8549_SS_TIMEOUT_FLAG_MASK); + sc->cp_switch = !!(stat & SC8549_CONV_SWITCHING_STAT_MASK); } ret = sc8549_read_byte(sc, SC8549_REG_0F, &flag);