ath9k_hw: remove ar9100_hw_compute_pll_control
authorFelix Fietkau <nbd@openwrt.org>
Thu, 15 Sep 2011 12:25:38 +0000 (14:25 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Sep 2011 19:58:25 +0000 (15:58 -0400)
AR913x uses the same PLL register layout as AR9160 and later.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/ar5008_phy.c

index 794a2d96a8ef523bfdcd4108954a191549091a04..0a749c8fa634830cbb90239e13ebc7ed8a343685 100644 (file)
@@ -1010,14 +1010,6 @@ static void ar5008_restore_chainmask(struct ath_hw *ah)
        }
 }
 
-static u32 ar9100_hw_compute_pll_control(struct ath_hw *ah,
-                                        struct ath9k_channel *chan)
-{
-       if (chan && IS_CHAN_5GHZ(chan))
-               return 0x1450;
-       return 0x1458;
-}
-
 static u32 ar9160_hw_compute_pll_control(struct ath_hw *ah,
                                         struct ath9k_channel *chan)
 {
@@ -1656,9 +1648,7 @@ void ar5008_hw_attach_phy_ops(struct ath_hw *ah)
        } else
                priv_ops->ani_control = ar5008_hw_ani_control_old;
 
-       if (AR_SREV_9100(ah))
-               priv_ops->compute_pll_control = ar9100_hw_compute_pll_control;
-       else if (AR_SREV_9160_10_OR_LATER(ah))
+       if (AR_SREV_9100(ah) || AR_SREV_9160_10_OR_LATER(ah))
                priv_ops->compute_pll_control = ar9160_hw_compute_pll_control;
        else
                priv_ops->compute_pll_control = ar5008_hw_compute_pll_control;