Commit a300ce95 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 697d600d
...@@ -1376,7 +1376,7 @@ wlc_channel_reg_limits(wlc_cm_info_t *wlc_cm, chanspec_t chanspec, ...@@ -1376,7 +1376,7 @@ wlc_channel_reg_limits(wlc_cm_info_t *wlc_cm, chanspec_t chanspec,
/* Keep OFDM lmit below CCK limit */ /* Keep OFDM lmit below CCK limit */
if (BAND_2G(band->bandtype)) 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++) { for (i = 0; i < WLC_NUM_RATES_OFDM; i++) {
txpwr->ofdm[i] = (u8) maxpwr; txpwr->ofdm[i] = (u8) maxpwr;
......
...@@ -4806,7 +4806,7 @@ wlc_doiovar(void *hdl, const bcm_iovar_t *vi, u32 actionid, ...@@ -4806,7 +4806,7 @@ wlc_doiovar(void *hdl, const bcm_iovar_t *vi, u32 actionid,
bool override; bool override;
/* Remove override bit and clip to max qdbm value */ /* 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 */ /* Extract override setting */
override = (int_val & WL_TXPWR_OVERRIDE) ? TRUE : FALSE; override = (int_val & WL_TXPWR_OVERRIDE) ? TRUE : FALSE;
err = err =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment