From: Felix Fietkau Date: Thu, 15 Sep 2011 12:25:38 +0000 (+0200) Subject: ath9k_hw: remove ar9100_hw_compute_pll_control X-Git-Tag: MMI-PSA29.97-13-9~18194^2~183^2~106 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=491b209d06192a8b93d226b4e5d7399747bf01ef;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ath9k_hw: remove ar9100_hw_compute_pll_control AR913x uses the same PLL register layout as AR9160 and later. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c index 794a2d96a8ef..0a749c8fa634 100644 --- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c +++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c @@ -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;