aboutsummaryrefslogtreecommitdiff
path: root/src/soc/qualcomm/ipq40xx
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2019-05-01 16:51:20 -0700
committerPatrick Georgi <pgeorgi@google.com>2019-05-06 10:32:15 +0000
commit7c712bbb6c969ae7014707bfddedd821035a2171 (patch)
tree4c357814eabac828a5d7cea3e0bd90b5b15851d1 /src/soc/qualcomm/ipq40xx
parent9d3fa7a22985a2ae080a8e36c89107691d15174f (diff)
Fix code that would trip -Wtype-limits
This patch fixes up all code that would throw a -Wtype-limits warning. This sometimes involves eliminating unnecessary checks, adding a few odd but harmless casts or just pragma'ing out the warning for a whole file -- I tried to find the path of least resistance. I think the overall benefit of the warning outweighs the occasional weirdness. Change-Id: Iacd37eb1fad388d9db7267ceccb03e6dcf1ad0d2 Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32537 Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/qualcomm/ipq40xx')
-rw-r--r--src/soc/qualcomm/ipq40xx/qup.c3
-rw-r--r--src/soc/qualcomm/ipq40xx/spi.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/src/soc/qualcomm/ipq40xx/qup.c b/src/soc/qualcomm/ipq40xx/qup.c
index 9d1f92d48a..438bd14757 100644
--- a/src/soc/qualcomm/ipq40xx/qup.c
+++ b/src/soc/qualcomm/ipq40xx/qup.c
@@ -478,8 +478,7 @@ qup_return_t qup_set_state(blsp_qup_id_t id, uint32_t state)
qup_return_t ret = QUP_ERR_UNDEFINED;
unsigned curr_state = read32(QUP_ADDR(id, QUP_STATE));
- if ((state >= QUP_STATE_RESET && state <= QUP_STATE_PAUSE)
- && (curr_state & QUP_STATE_VALID_MASK)) {
+ if (state <= QUP_STATE_PAUSE && (curr_state & QUP_STATE_VALID_MASK)) {
/*
* For PAUSE_STATE to RESET_STATE transition,
* two writes of 10[binary]) are required for the
diff --git a/src/soc/qualcomm/ipq40xx/spi.c b/src/soc/qualcomm/ipq40xx/spi.c
index 109eda9fc0..b68e1cb864 100644
--- a/src/soc/qualcomm/ipq40xx/spi.c
+++ b/src/soc/qualcomm/ipq40xx/spi.c
@@ -648,8 +648,8 @@ static int spi_ctrlr_setup(const struct spi_slave *slave)
{
struct ipq_spi_slave *ds = NULL;
int i;
- unsigned int bus = slave->bus;
- unsigned int cs = slave->cs;
+ int bus = slave->bus;
+ int cs = slave->cs;
if ((bus < BLSP0_SPI) || (bus > BLSP1_SPI)
|| ((bus == BLSP0_SPI) && (cs > 2))