ath9k: use standard max(), remove A_MAX macro

Signed-off-by: Pavel Roskin <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 3bf1d83ab41f58c5b48d45ff8c463a0d9817e46d..b9c177f532b150efa4d2d20d5b98fa3072014bc3 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -54,8 +54,6 @@ struct ath_node;
                (_l) &= ((_sz) - 1);            \
        } while (0)
 
-#define A_MAX(a, b) ((a) > (b) ? (a) : (b))
-
 #define TSF_TO_TU(_h,_l) \
        ((((u32)(_h)) << 22) | (((u32)(_l)) >> 10))
 

diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index ba7f36ab0a74231eb82731e9292ffcd737601852..e7fe4d9aee797dcd86760486b0536c5f676a406a 100644 (file)
--- 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,
                                        [valid_rate_count] = j;
                                ath_rc_priv->valid_phy_ratecnt[phy] += 1;
                                ath_rc_set_valid_rate_idx(ath_rc_priv, j, 1);
-                               hi = A_MAX(hi, j);
+                               hi = max(hi, j);
                        }
                }
        }
@@ -569,7 +569,7 @@ static u8 ath_rc_setvalid_htrates(struct ath_rate_priv *ath_rc_priv,
                                [ath_rc_priv->valid_phy_ratecnt[phy]] = j;
                        ath_rc_priv->valid_phy_ratecnt[phy] += 1;
                        ath_rc_set_valid_rate_idx(ath_rc_priv, j, 1);
-                       hi = A_MAX(hi, j);
+                       hi = max(hi, j);
                }
        }
 
@@ -1228,7 +1228,7 @@ static void ath_rc_init(struct ath_softc *sc,
                                                       ht_mcs,
                                                       ath_rc_priv->ht_cap);
                }
-               hi = A_MAX(hi, hthi);
+               hi = max(hi, hthi);
        }
 
        ath_rc_priv->rate_table_size = hi + 1;