Staging: brcm80211: remove broken MIN() implementation
Use the kernel-provided version, this one is broken.
Note, there are more compiler warnings now, that's due to different
types being compared, which shows how the original macro was wrong in at
least one way. They need to be fixed up.
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index ccfc54a..a364e1e 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -979,7 +979,7 @@
(DHD_DATA_ON() && (chan != SDPCM_CONTROL_CHANNEL))))) {
prhex("Tx Frame", frame, len);
} else if (DHD_HDRS_ON()) {
- prhex("TxHdr", frame, MIN(len, 16));
+ prhex("TxHdr", frame, min(len, 16));
}
#endif
@@ -1312,7 +1312,7 @@
if (DHD_BYTES_ON() && DHD_CTL_ON())
prhex("Tx Frame", frame, len);
else if (DHD_HDRS_ON())
- prhex("TxHdr", frame, MIN(len, 16));
+ prhex("TxHdr", frame, min(len, 16));
#endif
do {
@@ -1390,7 +1390,7 @@
dhd_os_sdlock(bus->dhd);
rxlen = bus->rxlen;
- bcopy(bus->rxctl, msg, MIN(msglen, rxlen));
+ bcopy(bus->rxctl, msg, min(msglen, rxlen));
bus->rxlen = 0;
dhd_os_sdunlock(bus->dhd);
@@ -1681,7 +1681,7 @@
bus->pktgen_tick = bus->pktgen_ptick = 0;
bus->pktgen_len = MAX(bus->pktgen_len, bus->pktgen_minlen);
- bus->pktgen_len = MIN(bus->pktgen_len, bus->pktgen_maxlen);
+ bus->pktgen_len = min(bus->pktgen_len, bus->pktgen_maxlen);
/* Clear counts for a new pktgen (mode change, or was stopped) */
if (bus->pktgen_count && (!oldcnt || oldmode != bus->pktgen_mode))
@@ -1737,7 +1737,7 @@
break;
}
sdaddr = 0;
- dsize = MIN(SBSDIO_SB_OFT_ADDR_LIMIT, size);
+ dsize = min(SBSDIO_SB_OFT_ADDR_LIMIT, size);
}
}
@@ -1954,7 +1954,7 @@
printf("Dump dongle memory");
databuf = buf;
while (size) {
- read_size = MIN(MEMBLOCK, size);
+ read_size = min(MEMBLOCK, size);
ret = dhdsdio_membytes(bus, FALSE, start, databuf, read_size);
if (ret) {
printf("%s: Error membytes %d\n", __func__, ret);
@@ -2781,7 +2781,7 @@
bus->blocksize));
}
}
- bus->roundup = MIN(max_roundup, bus->blocksize);
+ bus->roundup = min(max_roundup, bus->blocksize);
if ((bus->idletime == DHD_IDLE_IMMEDIATE) && !bus->dpc_sched) {
bus->activity = FALSE;
@@ -3355,7 +3355,7 @@
#ifdef DHD_DEBUG
if (DHD_GLOM_ON()) {
prhex("SUPERFRAME", PKTDATA(pfirst),
- MIN(PKTLEN(pfirst), 48));
+ min(PKTLEN(pfirst), 48));
}
#endif
@@ -3559,7 +3559,7 @@
PKTLEN(pfirst), PKTNEXT(pfirst),
PKTLINK(pfirst)));
prhex("", (u8 *) PKTDATA(pfirst),
- MIN(PKTLEN(pfirst), 32));
+ min(PKTLEN(pfirst), 32));
}
#endif /* DHD_DEBUG */
}
@@ -4432,7 +4432,7 @@
framecnt = dhdsdio_readframes(bus, rxlimit, &rxdone);
if (rxdone || bus->rxskip)
intstatus &= ~I_HMB_FRAME_IND;
- rxlimit -= MIN(framecnt, rxlimit);
+ rxlimit -= min(framecnt, rxlimit);
}
/* Keep still-pending events for next scheduling */
@@ -4503,7 +4503,7 @@
else if ((bus->clkstate == CLK_AVAIL) && !bus->fcstate &&
pktq_mlen(&bus->txq, ~bus->flowcontrol) && txlimit
&& DATAOK(bus)) {
- framecnt = rxdone ? txlimit : MIN(txlimit, dhd_txminmax);
+ framecnt = rxdone ? txlimit : min(txlimit, dhd_txminmax);
framecnt = dhdsdio_sendfromq(bus, framecnt);
txlimit -= framecnt;
}
@@ -4605,7 +4605,7 @@
{
/* Default to specified length, or full range */
if (dhd_pktgen_len) {
- bus->pktgen_maxlen = MIN(dhd_pktgen_len, MAX_PKTGEN_LEN);
+ bus->pktgen_maxlen = min(dhd_pktgen_len, MAX_PKTGEN_LEN);
bus->pktgen_minlen = bus->pktgen_maxlen;
} else {
bus->pktgen_maxlen = MAX_PKTGEN_LEN;
@@ -5498,7 +5498,7 @@
DHD_INFO(("%s: Initial value for %s is %d\n",
__func__, "sd_blocksize", bus->blocksize));
}
- bus->roundup = MIN(max_roundup, bus->blocksize);
+ bus->roundup = min(max_roundup, bus->blocksize);
/* Query if bus module supports packet chaining,
default to use if supported */