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
This commit is contained in:
parent
697be9a3bd
commit
e06262c163
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=336325
@ -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;) {
|
for (i = 0; i < count;) {
|
||||||
edm = RD4(sc, HC_DEBUG);
|
edm = RD4(sc, HC_DEBUG);
|
||||||
avail = ((edm >> 4) & 0x1f);
|
avail = ((edm >> 4) & 0x1f);
|
||||||
if (i + avail > count) {
|
if (i + avail > count)
|
||||||
if (i >= count)
|
avail = count - i;
|
||||||
return;
|
|
||||||
else
|
|
||||||
avail = count - i;
|
|
||||||
}
|
|
||||||
if (avail > 0)
|
if (avail > 0)
|
||||||
bus_space_read_multi_4(sc->sc_bst, sc->sc_bsh,
|
bus_space_read_multi_4(sc->sc_bst, sc->sc_bsh,
|
||||||
HC_DATAPORT, data + i, avail);
|
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;) {
|
for (i = 0; i < count;) {
|
||||||
edm = RD4(sc, HC_DEBUG);
|
edm = RD4(sc, HC_DEBUG);
|
||||||
space = HC_FIFO_SIZE - ((edm >> 4) & 0x1f);
|
space = HC_FIFO_SIZE - ((edm >> 4) & 0x1f);
|
||||||
if (i + space > count) {
|
if (i + space > count)
|
||||||
if (i >= count)
|
space = count - i;
|
||||||
return;
|
|
||||||
else
|
|
||||||
space = count - i;
|
|
||||||
}
|
|
||||||
if (space > 0)
|
if (space > 0)
|
||||||
bus_space_write_multi_4(sc->sc_bst, sc->sc_bsh,
|
bus_space_write_multi_4(sc->sc_bst, sc->sc_bsh,
|
||||||
HC_DATAPORT, data + i, space);
|
HC_DATAPORT, data + i, space);
|
||||||
|
Loading…
Reference in New Issue
Block a user