Staging: brcm80211: sys: fix some comparison warnings

Use min_t() instead of min() in some places to make the
comparison explicit and resolve some compiler warnings.

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/sys/wlc_channel.c b/drivers/staging/brcm80211/sys/wlc_channel.c
index 1c3c043afbd5a9e02d216ba2d87402e893913ee7..f92ff9712d7fda46b49a44a8f6936607bab9ae73 100644 (file)
--- a/drivers/staging/brcm80211/sys/wlc_channel.c
+++ b/drivers/staging/brcm80211/sys/wlc_channel.c
@@ -1376,7 +1376,7 @@ wlc_channel_reg_limits(wlc_cm_info_t *wlc_cm, chanspec_t chanspec,
 
        /* Keep OFDM lmit below CCK limit */
        if (BAND_2G(band->bandtype))
-               maxpwr = min(maxpwr, txpwr->cck[0]);
+               maxpwr = min_t(int, 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 6ffbb02ad17d94ee22f34c3d32830e62661399d9..a5f7b9cdfa92c523a683ce925e560e1a1ca5950f 100644 (file)
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -4806,7 +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_t(u32, (int_val & ~WL_TXPWR_OVERRIDE), 0xff);
                        /* Extract override setting */
                        override = (int_val & WL_TXPWR_OVERRIDE) ? TRUE : FALSE;
                        err =