From e06262c1636d1ca4bcaae8d12a6ecf9bfd25eeb2 Mon Sep 17 00:00:00 2001 From: Oleksandr Tymoshenko Date: Mon, 16 Jul 2018 01:07:28 +0000 Subject: [PATCH] Remove two checks that are always false Outer loop condition contradicts inner check so code under inner condition is not reachable. Remove it. PR: 229722 Reported by: David Binderman --- sys/arm/broadcom/bcm2835/bcm2835_sdhost.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c b/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c index f4e724d05ec1..854f46dd9c79 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_sdhost.c @@ -1022,12 +1022,8 @@ bcm_sdhost_read_multi_4(device_t dev, struct sdhci_slot *slot, bus_size_t off, for (i = 0; i < count;) { edm = RD4(sc, HC_DEBUG); avail = ((edm >> 4) & 0x1f); - if (i + avail > count) { - if (i >= count) - return; - else - avail = count - i; - } + if (i + avail > count) + avail = count - i; if (avail > 0) bus_space_read_multi_4(sc->sc_bst, sc->sc_bsh, HC_DATAPORT, data + i, avail); @@ -1234,12 +1230,8 @@ bcm_sdhost_write_multi_4(device_t dev, struct sdhci_slot *slot, for (i = 0; i < count;) { edm = RD4(sc, HC_DEBUG); space = HC_FIFO_SIZE - ((edm >> 4) & 0x1f); - if (i + space > count) { - if (i >= count) - return; - else - space = count - i; - } + if (i + space > count) + space = count - i; if (space > 0) bus_space_write_multi_4(sc->sc_bst, sc->sc_bsh, HC_DATAPORT, data + i, space);