From c2ac43a982b1e5c842cb3bb4b46b9c3d5a6d6991 Mon Sep 17 00:00:00 2001 From: a7301c Date: Mon, 13 Apr 2020 15:05:44 -0500 Subject: [PATCH] fixup! (CR): aw8697: Add error checking to RTP mode Due to llvm is updated to 10.0.3, this would report build error l(CR): +++ /mnt/rider/a7301c/R_8250/kernel/msm-4.19/../../motorola/kernel/modules/drivers/misc/awinic/aw8697/aw8697.c:1353:10: warning: result of comparison of constant 0 with expression of type 'bool' (aka '_Bool') is always false [-Wtautological-constant-compare] +++ Change-Id: I4bc8ebe7829d060d34a06d09dbb7eeb39891731c Signed-off-by: a7301c Signed-off-by: Perry White Reviewed-on: https://gerrit.mot.com/1533709 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Submit-Approved: Jira Key Tested-by: Jira Key Reviewed-on: https://gerrit.mot.com/1540157 --- drivers/misc/awinic/aw8697/aw8697.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/misc/awinic/aw8697/aw8697.c b/drivers/misc/awinic/aw8697/aw8697.c index eab55b87413a..2cfde05c161f 100644 --- a/drivers/misc/awinic/aw8697/aw8697.c +++ b/drivers/misc/awinic/aw8697/aw8697.c @@ -1347,10 +1347,11 @@ static unsigned char aw8697_haptic_rtp_get_fifo_afs(struct aw8697 *aw8697) static bool aw8697_check_error(struct aw8697 *aw8697) { unsigned char reg_val; + int rc; bool ret = false; - aw8697_i2c_read(aw8697, AW8697_REG_SYSST, ®_val); - if (ret < 0) + rc = aw8697_i2c_read(aw8697, AW8697_REG_SYSST, ®_val); + if (rc < 0) return true; if (reg_val & AW8697_BIT_SYSST_UVLS) { @@ -2529,17 +2530,17 @@ static void __maybe_unused aw8697_haptic_context( case HAPTIC_RTP: if (aw8697->info.rtp_gain) aw8697->gain = aw8697->info.rtp_gain; - break; + break; case HAPTIC_SHORT: if (aw8697->info.short_gain) aw8697->gain = aw8697->info.short_gain; - break; + break; case HAPTIC_LONG: if (aw8697->info.long_gain_reduced) aw8697->gain = aw8697->info.long_gain_reduced; - break; + break; default: - break; + break; } }