ath9k_hw: simplify OLC temp compensation for AR9002
authorLuis R. Rodriguez <lrodriguez@atheros.com>
Thu, 15 Apr 2010 21:38:56 +0000 (17:38 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Apr 2010 19:43:30 +0000 (15:43 -0400)
We can do the family revision check on the top level caller.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/calib.c

index dae200c5fe0dd560c7a4cca663f8eb4d1547aef2..b44b3056c2fe1f41827db8bc98bc5432fd1ed96d 100644 (file)
@@ -730,14 +730,6 @@ static void ar9280_hw_olc_temp_compensation(struct ath_hw *ah)
        }
 }
 
-static void ath9k_olc_temp_compensation(struct ath_hw *ah)
-{
-       if (OLC_FOR_AR9287_10_LATER)
-               ar9287_hw_olc_temp_compensation(ah);
-       else
-               ar9280_hw_olc_temp_compensation(ah);
-}
-
 static void ath9k_hw_9271_pa_cal(struct ath_hw *ah, bool is_reset)
 {
        u32 regVal;
@@ -969,8 +961,10 @@ static void ar9002_hw_pa_cal(struct ath_hw *ah, bool is_reset)
 
 static void ar9002_hw_olc_temp_compensation(struct ath_hw *ah)
 {
-       if (OLC_FOR_AR9280_20_LATER || OLC_FOR_AR9287_10_LATER)
-               ath9k_olc_temp_compensation(ah);
+       if (OLC_FOR_AR9287_10_LATER)
+               ar9287_hw_olc_temp_compensation(ah);
+       else if (OLC_FOR_AR9280_20_LATER)
+               ar9280_hw_olc_temp_compensation(ah);
 }
 
 bool ath9k_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan,