Skip to content

Commit

Permalink
Staging: brcm80211: sys: fix some comparison warnings
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Oct 8, 2010
1 parent 697d600 commit a300ce9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/brcm80211/sys/wlc_channel.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/brcm80211/sys/wlc_mac80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down

0 comments on commit a300ce9

Please sign in to comment.