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>

4 files changed, 28 insertions, 29 deletions

diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.c b/drivers/staging/brcm80211/sys/wlc_ampdu.c
index a888484..f7e2904 100644
--- a/drivers/staging/brcm80211/sys/wlc_ampdu.c
+++ b/drivers/staging/brcm80211/sys/wlc_ampdu.c
@@ -290,13 +290,13 @@ static void scb_ampdu_update_config(ampdu_info_t *ampdu, struct scb *scb)
 	if (ampdu->max_pdu != AUTO)
 		scb_ampdu->max_pdu = (u8) ampdu->max_pdu;
 
-	scb_ampdu->release = MIN(scb_ampdu->max_pdu, AMPDU_SCB_MAX_RELEASE);
+	scb_ampdu->release = min(scb_ampdu->max_pdu, AMPDU_SCB_MAX_RELEASE);
 
 	if (scb_ampdu->max_rxlen)
 		scb_ampdu->release =
-		    MIN(scb_ampdu->release, scb_ampdu->max_rxlen / 1600);
+		    min(scb_ampdu->release, scb_ampdu->max_rxlen / 1600);
 
-	scb_ampdu->release = MIN(scb_ampdu->release,
+	scb_ampdu->release = min(scb_ampdu->release,
 				 ampdu->fifo_tb[TX_AC_BE_FIFO].
 				 mcs2ampdu_table[FFPLD_MAX_MCS]);
 
@@ -396,7 +396,7 @@ static int wlc_ffpld_check_txfunfl(wlc_info_t *wlc, int fid)
 		return 0;
 	}
 	max_mpdu =
-	    MIN(fifo->mcs2ampdu_table[FFPLD_MAX_MCS], AMPDU_NUM_MPDU_LEGACY);
+	    min(fifo->mcs2ampdu_table[FFPLD_MAX_MCS], AMPDU_NUM_MPDU_LEGACY);
 
 	/* In case max value max_pdu is already lower than
 	   the fifo depth, there is nothing more we can do.
@@ -462,7 +462,7 @@ static void wlc_ffpld_calc_mcs2ampdu_table(ampdu_info_t *ampdu, int f)
 	/* recompute the dma rate */
 	/* note : we divide/multiply by 100 to avoid integer overflows */
 	max_mpdu =
-	    MIN(fifo->mcs2ampdu_table[FFPLD_MAX_MCS], AMPDU_NUM_MPDU_LEGACY);
+	    min(fifo->mcs2ampdu_table[FFPLD_MAX_MCS], AMPDU_NUM_MPDU_LEGACY);
 	phy_rate = MCS_RATE(FFPLD_MAX_MCS, TRUE, FALSE);
 	dma_rate =
 	    (((phy_rate / 100) *
@@ -478,7 +478,7 @@ static void wlc_ffpld_calc_mcs2ampdu_table(ampdu_info_t *ampdu, int f)
 		if (phy_rate > dma_rate) {
 			tmp = ((fifo->ampdu_pld_size * phy_rate) /
 			       ((phy_rate - dma_rate) * FFPLD_MPDU_SIZE)) + 1;
-			tmp = MIN(tmp, 255);
+			tmp = min(tmp, 255);
 			fifo->mcs2ampdu_table[i] = (u8) tmp;
 		}
 	}
@@ -694,7 +694,7 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
 			mcs = plcp0 & ~MIMO_PLCP_40MHZ;
 			ASSERT(mcs < MCS_TABLE_SIZE);
 			maxlen =
-			    MIN(scb_ampdu->max_rxlen,
+			    min(scb_ampdu->max_rxlen,
 				ampdu->max_txlen[mcs][is40][sgi]);
 
 			WL_NONE(("sendampdu: sgi %d, is40 %d, mcs %d\n", sgi,
@@ -832,7 +832,7 @@ wlc_sendampdu(ampdu_info_t *ampdu, wlc_txq_info_t *qi, void **pdu, int prec)
 
 		/* set the preload length */
 		if (MCS_RATE(mcs, TRUE, FALSE) >= f->dmaxferrate) {
-			dma_len = MIN(dma_len, f->ampdu_pld_size);
+			dma_len = min(dma_len, f->ampdu_pld_size);
 			txh->PreloadSize = htol16(dma_len);
 		} else
 			txh->PreloadSize = 0;
diff --git a/drivers/staging/brcm80211/sys/wlc_channel.c b/drivers/staging/brcm80211/sys/wlc_channel.c
index 32c2d10..6795c20 100644
--- a/drivers/staging/brcm80211/sys/wlc_channel.c
+++ b/drivers/staging/brcm80211/sys/wlc_channel.c
@@ -1084,80 +1084,80 @@ wlc_channel_min_txpower_limits_with_local_constraint(wlc_cm_info_t *wlc_cm,
 
 	/* CCK Rates */
 	for (j = 0; j < WL_TX_POWER_CCK_NUM; j++) {
-		txpwr->cck[j] = MIN(txpwr->cck[j], local_constraint_qdbm);
+		txpwr->cck[j] = min(txpwr->cck[j], local_constraint_qdbm);
 	}
 
 	/* 20 MHz Legacy OFDM SISO */
 	for (j = 0; j < WL_TX_POWER_OFDM_NUM; j++) {
-		txpwr->ofdm[j] = MIN(txpwr->ofdm[j], local_constraint_qdbm);
+		txpwr->ofdm[j] = min(txpwr->ofdm[j], local_constraint_qdbm);
 	}
 
 	/* 20 MHz Legacy OFDM CDD */
 	for (j = 0; j < WLC_NUM_RATES_OFDM; j++) {
 		txpwr->ofdm_cdd[j] =
-		    MIN(txpwr->ofdm_cdd[j], local_constraint_qdbm);
+		    min(txpwr->ofdm_cdd[j], local_constraint_qdbm);
 	}
 
 	/* 40 MHz Legacy OFDM SISO */
 	for (j = 0; j < WLC_NUM_RATES_OFDM; j++) {
 		txpwr->ofdm_40_siso[j] =
-		    MIN(txpwr->ofdm_40_siso[j], local_constraint_qdbm);
+		    min(txpwr->ofdm_40_siso[j], local_constraint_qdbm);
 	}
 
 	/* 40 MHz Legacy OFDM CDD */
 	for (j = 0; j < WLC_NUM_RATES_OFDM; j++) {
 		txpwr->ofdm_40_cdd[j] =
-		    MIN(txpwr->ofdm_40_cdd[j], local_constraint_qdbm);
+		    min(txpwr->ofdm_40_cdd[j], local_constraint_qdbm);
 	}
 
 	/* 20MHz MCS 0-7 SISO */
 	for (j = 0; j < WLC_NUM_RATES_MCS_1_STREAM; j++) {
 		txpwr->mcs_20_siso[j] =
-		    MIN(txpwr->mcs_20_siso[j], local_constraint_qdbm);
+		    min(txpwr->mcs_20_siso[j], local_constraint_qdbm);
 	}
 
 	/* 20MHz MCS 0-7 CDD */
 	for (j = 0; j < WLC_NUM_RATES_MCS_1_STREAM; j++) {
 		txpwr->mcs_20_cdd[j] =
-		    MIN(txpwr->mcs_20_cdd[j], local_constraint_qdbm);
+		    min(txpwr->mcs_20_cdd[j], local_constraint_qdbm);
 	}
 
 	/* 20MHz MCS 0-7 STBC */
 	for (j = 0; j < WLC_NUM_RATES_MCS_1_STREAM; j++) {
 		txpwr->mcs_20_stbc[j] =
-		    MIN(txpwr->mcs_20_stbc[j], local_constraint_qdbm);
+		    min(txpwr->mcs_20_stbc[j], local_constraint_qdbm);
 	}
 
 	/* 20MHz MCS 8-15 MIMO */
 	for (j = 0; j < WLC_NUM_RATES_MCS_2_STREAM; j++)
 		txpwr->mcs_20_mimo[j] =
-		    MIN(txpwr->mcs_20_mimo[j], local_constraint_qdbm);
+		    min(txpwr->mcs_20_mimo[j], local_constraint_qdbm);
 
 	/* 40MHz MCS 0-7 SISO */
 	for (j = 0; j < WLC_NUM_RATES_MCS_1_STREAM; j++) {
 		txpwr->mcs_40_siso[j] =
-		    MIN(txpwr->mcs_40_siso[j], local_constraint_qdbm);
+		    min(txpwr->mcs_40_siso[j], local_constraint_qdbm);
 	}
 
 	/* 40MHz MCS 0-7 CDD */
 	for (j = 0; j < WLC_NUM_RATES_MCS_1_STREAM; j++) {
 		txpwr->mcs_40_cdd[j] =
-		    MIN(txpwr->mcs_40_cdd[j], local_constraint_qdbm);
+		    min(txpwr->mcs_40_cdd[j], local_constraint_qdbm);
 	}
 
 	/* 40MHz MCS 0-7 STBC */
 	for (j = 0; j < WLC_NUM_RATES_MCS_1_STREAM; j++) {
 		txpwr->mcs_40_stbc[j] =
-		    MIN(txpwr->mcs_40_stbc[j], local_constraint_qdbm);
+		    min(txpwr->mcs_40_stbc[j], local_constraint_qdbm);
 	}
 
 	/* 40MHz MCS 8-15 MIMO */
 	for (j = 0; j < WLC_NUM_RATES_MCS_2_STREAM; j++)
 		txpwr->mcs_40_mimo[j] =
-		    MIN(txpwr->mcs_40_mimo[j], local_constraint_qdbm);
+		    min(txpwr->mcs_40_mimo[j], local_constraint_qdbm);
 
 	/* 40MHz MCS 32 */
-	txpwr->mcs32 = MIN(txpwr->mcs32, local_constraint_qdbm);
+	txpwr->mcs32 = min(txpwr->mcs32, local_constraint_qdbm);
 
 }
 
@@ -1356,7 +1356,7 @@ wlc_channel_reg_limits(wlc_cm_info_t *wlc_cm, chanspec_t chanspec,
 
 		maxpwr = maxpwr - delta;
 		maxpwr = MAX(maxpwr, 0);
-		maxpwr = MIN(maxpwr, conducted_max);
+		maxpwr = min(maxpwr, conducted_max);
 
 		for (i = 0; i < WLC_NUM_RATES_CCK; i++)
 			txpwr->cck[i] = (u8) maxpwr;
@@ -1372,11 +1372,11 @@ wlc_channel_reg_limits(wlc_cm_info_t *wlc_cm, chanspec_t chanspec,
 
 	maxpwr = maxpwr - delta;
 	maxpwr = MAX(maxpwr, 0);
-	maxpwr = MIN(maxpwr, conducted_ofdm_max);
+	maxpwr = min(maxpwr, conducted_ofdm_max);
 
 	/* Keep OFDM lmit below CCK limit */
 	if (BAND_2G(band->bandtype))
-		maxpwr = MIN(maxpwr, txpwr->cck[0]);
+		maxpwr = min(maxpwr, txpwr->cck[0]);
 
 	for (i = 0; i < WLC_NUM_RATES_OFDM; i++) {
 		txpwr->ofdm[i] = (u8) maxpwr;
diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index 79863a2..460587c 100644
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -4806,8 +4806,7 @@ wlc_doiovar(void *hdl, const bcm_iovar_t *vi, u32 actionid,
 			bool override;
 
 			/* Remove override bit and clip to max qdbm value */
-			qdbm =
-			    (u8) MIN((int_val & ~WL_TXPWR_OVERRIDE), 0xff);
+			qdbm = (u8)min((int_val & ~WL_TXPWR_OVERRIDE), 0xff);
 			/* Extract override setting */
 			override = (int_val & WL_TXPWR_OVERRIDE) ? TRUE : FALSE;
 			err =
diff --git a/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/sys/wlc_pub.h
index bcb30cd..d5f1bad 100644
--- a/drivers/staging/brcm80211/sys/wlc_pub.h
+++ b/drivers/staging/brcm80211/sys/wlc_pub.h
@@ -57,7 +57,7 @@
 
 #define WLC_SNR_INVALID		0	/* invalid SNR value */
 
-/* a large TX Power as an init value to factor out of MIN() calculations,
+/* a large TX Power as an init value to factor out of min() calculations,
  * keep low enough to fit in an s8, units are .25 dBm
  */
 #define WLC_TXPWR_MAX		(127)	/* ~32 dBm = 1,500 mW */
@@ -456,7 +456,7 @@ extern const u8 wlc_prio2prec_map[];
 /* This maps priority to one precedence higher - Used by PS-Poll response packets to
  * simulate enqueue-at-head operation, but still maintain the order on the queue
  */
-#define WLC_PRIO_TO_HI_PREC(pri)	MIN(WLC_PRIO_TO_PREC(pri) + 1, WLC_PREC_COUNT - 1)
+#define WLC_PRIO_TO_HI_PREC(pri)	min(WLC_PRIO_TO_PREC(pri) + 1, WLC_PREC_COUNT - 1)
 
 extern const u8 wme_fifo2ac[];
 #define WME_PRIO2AC(prio)	wme_fifo2ac[prio2fifo[(prio)]]