aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2019-12-03 23:21:54 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2019-12-03 23:21:54 +0000
commit87b582ef5b31c5893a470b61c217931fc7602da3 (patch)
tree36f8419f61b6cd6a561afc9742e67156ad479b46
parentf67a2977de70946c33d18ac75a8bbcea092514a1 (diff)
parentd7b4cd4111ab4cfde60f693a789a290870c02035 (diff)
downloadtrusted-firmware-a-87b582ef5b31c5893a470b61c217931fc7602da3.tar.gz
Merge "Enable -Wlogical-op always" into integration
-rw-r--r--Makefile11
-rw-r--r--drivers/mentor/i2c/mi2cv.c4
-rw-r--r--plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c2
3 files changed, 8 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 05820619e0..d634b336b9 100644
--- a/Makefile
+++ b/Makefile
@@ -246,7 +246,6 @@ WARNING1 += -Wunused-const-variable
WARNING2 := -Waggregate-return
WARNING2 += -Wcast-align
WARNING2 += -Wnested-externs
-WARNING2 += -Wlogical-op
WARNING3 := -Wbad-function-cast
WARNING3 += -Wcast-qual
@@ -268,13 +267,13 @@ endif
# Compiler specific warnings
ifeq ($(findstring clang,$(notdir $(CC))),)
# not using clang
-WARNINGS += -Wunused-but-set-variable \
- -Wmaybe-uninitialized \
- -Wpacked-bitfield-compat \
- -Wshift-overflow=2
+WARNINGS += -Wunused-but-set-variable -Wmaybe-uninitialized \
+ -Wpacked-bitfield-compat -Wshift-overflow=2 \
+ -Wlogical-op
else
# using clang
-WARNINGS += -Wshift-overflow -Wshift-sign-overflow
+WARNINGS += -Wshift-overflow -Wshift-sign-overflow \
+ -Wlogical-op-parentheses
endif
ifneq (${E},0)
diff --git a/drivers/mentor/i2c/mi2cv.c b/drivers/mentor/i2c/mi2cv.c
index 1cdcf7478c..b0270c9551 100644
--- a/drivers/mentor/i2c/mi2cv.c
+++ b/drivers/mentor/i2c/mi2cv.c
@@ -81,14 +81,14 @@ static void mentor_i2c_interrupt_clear(void)
udelay(1);
}
-static int mentor_i2c_interrupt_get(void)
+static bool mentor_i2c_interrupt_get(void)
{
uint32_t reg;
/* get the interrupt flag bit */
reg = mmio_read_32((uintptr_t)&base->control);
reg &= I2C_CONTROL_IFLG;
- return reg && I2C_CONTROL_IFLG;
+ return (reg != 0U);
}
static int mentor_i2c_wait_interrupt(void)
diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c b/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c
index 44acb4bd58..60e80d907c 100644
--- a/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c
+++ b/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c
@@ -58,7 +58,7 @@ static enum pm_ret_status pm_ioctl_set_rpu_oper_mode(unsigned int mode)
{
unsigned int val;
- if (mmio_read_32(CRL_APB_RST_LPD_TOP) && CRL_APB_RPU_AMBA_RESET)
+ if (mmio_read_32(CRL_APB_RST_LPD_TOP) & CRL_APB_RPU_AMBA_RESET)
return PM_RET_ERROR_ACCESS;
val = mmio_read_32(ZYNQMP_RPU_GLBL_CNTL);