aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/rc.c
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2011-06-15 18:01:05 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-06-17 14:22:25 -0400
commitf6351d486dfecd56d57ee194f5d358d9a4fec840 (patch)
tree18d9bf71468f991d2a274ddabf15520c23c5349a /drivers/net/wireless/ath/ath9k/rc.c
parentd3af4396cff3d86a6a37e1cc5fe8d077f62c263e (diff)
ath9k: use standard max(), remove A_MAX macro
Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/rc.c')
-rw-r--r--drivers/net/wireless/ath/ath9k/rc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index ba7f36ab0a7..e7fe4d9aee7 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -533,7 +533,7 @@ static u8 ath_rc_setvalid_rates(struct ath_rate_priv *ath_rc_priv,
533 [valid_rate_count] = j; 533 [valid_rate_count] = j;
534 ath_rc_priv->valid_phy_ratecnt[phy] += 1; 534 ath_rc_priv->valid_phy_ratecnt[phy] += 1;
535 ath_rc_set_valid_rate_idx(ath_rc_priv, j, 1); 535 ath_rc_set_valid_rate_idx(ath_rc_priv, j, 1);
536 hi = A_MAX(hi, j); 536 hi = max(hi, j);
537 } 537 }
538 } 538 }
539 } 539 }
@@ -569,7 +569,7 @@ static u8 ath_rc_setvalid_htrates(struct ath_rate_priv *ath_rc_priv,
569 [ath_rc_priv->valid_phy_ratecnt[phy]] = j; 569 [ath_rc_priv->valid_phy_ratecnt[phy]] = j;
570 ath_rc_priv->valid_phy_ratecnt[phy] += 1; 570 ath_rc_priv->valid_phy_ratecnt[phy] += 1;
571 ath_rc_set_valid_rate_idx(ath_rc_priv, j, 1); 571 ath_rc_set_valid_rate_idx(ath_rc_priv, j, 1);
572 hi = A_MAX(hi, j); 572 hi = max(hi, j);
573 } 573 }
574 } 574 }
575 575
@@ -1228,7 +1228,7 @@ static void ath_rc_init(struct ath_softc *sc,
1228 ht_mcs, 1228 ht_mcs,
1229 ath_rc_priv->ht_cap); 1229 ath_rc_priv->ht_cap);
1230 } 1230 }
1231 hi = A_MAX(hi, hthi); 1231 hi = max(hi, hthi);
1232 } 1232 }
1233 1233
1234 ath_rc_priv->rate_table_size = hi + 1; 1234 ath_rc_priv->rate_table_size = hi + 1;