提交 84c87dc8 编写于 作者: S Stanislaw Gruszka 提交者: John W. Linville

ath9k: remove ->config_pci_powersave() redundant argument

We always call ->config_pci_powersave() with both restore and power_off
arguments equal to 0 or both equal to 1, so merge them into one
argument.
Signed-off-by: NStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 af2bf4b4
...@@ -303,8 +303,7 @@ static void ar9002_hw_init_mode_gain_regs(struct ath_hw *ah) ...@@ -303,8 +303,7 @@ static void ar9002_hw_init_mode_gain_regs(struct ath_hw *ah)
* register as the other analog registers. Hence the 9 writes. * register as the other analog registers. Hence the 9 writes.
*/ */
static void ar9002_hw_configpcipowersave(struct ath_hw *ah, static void ar9002_hw_configpcipowersave(struct ath_hw *ah,
int restore, bool power_off)
int power_off)
{ {
u8 i; u8 i;
u32 val; u32 val;
...@@ -313,7 +312,7 @@ static void ar9002_hw_configpcipowersave(struct ath_hw *ah, ...@@ -313,7 +312,7 @@ static void ar9002_hw_configpcipowersave(struct ath_hw *ah,
return; return;
/* Nothing to do on restore for 11N */ /* Nothing to do on restore for 11N */
if (!restore) { if (!power_off /* !restore */) {
if (AR_SREV_9280_20_OR_LATER(ah)) { if (AR_SREV_9280_20_OR_LATER(ah)) {
/* /*
* AR9280 2.0 or later chips use SerDes values from the * AR9280 2.0 or later chips use SerDes values from the
......
...@@ -516,14 +516,13 @@ static void ar9003_hw_init_mode_gain_regs(struct ath_hw *ah) ...@@ -516,14 +516,13 @@ static void ar9003_hw_init_mode_gain_regs(struct ath_hw *ah)
* register as the other analog registers. Hence the 9 writes. * register as the other analog registers. Hence the 9 writes.
*/ */
static void ar9003_hw_configpcipowersave(struct ath_hw *ah, static void ar9003_hw_configpcipowersave(struct ath_hw *ah,
int restore, bool power_off)
int power_off)
{ {
if (ah->is_pciexpress != true || ah->aspm_enabled != true) if (ah->is_pciexpress != true || ah->aspm_enabled != true)
return; return;
/* Nothing to do on restore for 11N */ /* Nothing to do on restore for 11N */
if (!restore) { if (!power_off /* !restore */) {
/* set bit 19 to allow forcing of pcie core into L1 state */ /* set bit 19 to allow forcing of pcie core into L1 state */
REG_SET_BIT(ah, AR_PCIE_PM_CTRL, AR_PCIE_PM_CTRL_ENA); REG_SET_BIT(ah, AR_PCIE_PM_CTRL, AR_PCIE_PM_CTRL_ENA);
......
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
/* Hardware core and driver accessible callbacks */ /* Hardware core and driver accessible callbacks */
static inline void ath9k_hw_configpcipowersave(struct ath_hw *ah, static inline void ath9k_hw_configpcipowersave(struct ath_hw *ah,
int restore, bool power_off)
int power_off)
{ {
ath9k_hw_ops(ah)->config_pci_powersave(ah, restore, power_off); ath9k_hw_ops(ah)->config_pci_powersave(ah, power_off);
} }
static inline void ath9k_hw_rxena(struct ath_hw *ah) static inline void ath9k_hw_rxena(struct ath_hw *ah)
......
...@@ -606,8 +606,7 @@ struct ath_hw_private_ops { ...@@ -606,8 +606,7 @@ struct ath_hw_private_ops {
*/ */
struct ath_hw_ops { struct ath_hw_ops {
void (*config_pci_powersave)(struct ath_hw *ah, void (*config_pci_powersave)(struct ath_hw *ah,
int restore, bool power_off);
int power_off);
void (*rx_enable)(struct ath_hw *ah); void (*rx_enable)(struct ath_hw *ah);
void (*set_desc_link)(void *ds, u32 link); void (*set_desc_link)(void *ds, u32 link);
bool (*calibrate)(struct ath_hw *ah, bool (*calibrate)(struct ath_hw *ah,
......
...@@ -888,7 +888,7 @@ static void ath_radio_enable(struct ath_softc *sc, struct ieee80211_hw *hw) ...@@ -888,7 +888,7 @@ static void ath_radio_enable(struct ath_softc *sc, struct ieee80211_hw *hw)
spin_lock_bh(&sc->sc_pcu_lock); spin_lock_bh(&sc->sc_pcu_lock);
atomic_set(&ah->intr_ref_cnt, -1); atomic_set(&ah->intr_ref_cnt, -1);
ath9k_hw_configpcipowersave(ah, 0, 0); ath9k_hw_configpcipowersave(ah, false);
if (!ah->curchan) if (!ah->curchan)
ah->curchan = ath9k_cmn_get_curchannel(sc->hw, ah); ah->curchan = ath9k_cmn_get_curchannel(sc->hw, ah);
...@@ -969,7 +969,7 @@ void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw) ...@@ -969,7 +969,7 @@ void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw)
ath9k_hw_phy_disable(ah); ath9k_hw_phy_disable(ah);
ath9k_hw_configpcipowersave(ah, 1, 1); ath9k_hw_configpcipowersave(ah, true);
spin_unlock_bh(&sc->sc_pcu_lock); spin_unlock_bh(&sc->sc_pcu_lock);
ath9k_ps_restore(sc); ath9k_ps_restore(sc);
...@@ -1069,7 +1069,7 @@ static int ath9k_start(struct ieee80211_hw *hw) ...@@ -1069,7 +1069,7 @@ static int ath9k_start(struct ieee80211_hw *hw)
init_channel = ath9k_cmn_get_curchannel(hw, ah); init_channel = ath9k_cmn_get_curchannel(hw, ah);
/* Reset SERDES registers */ /* Reset SERDES registers */
ath9k_hw_configpcipowersave(ah, 0, 0); ath9k_hw_configpcipowersave(ah, false);
/* /*
* The basic interface to setting the hardware in a good * The basic interface to setting the hardware in a good
......
...@@ -35,6 +35,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = { ...@@ -35,6 +35,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
{ 0 } { 0 }
}; };
/* return bus cachesize in 4B word units */ /* return bus cachesize in 4B word units */
static void ath_pci_read_cachesize(struct ath_common *common, int *csz) static void ath_pci_read_cachesize(struct ath_common *common, int *csz)
{ {
...@@ -137,7 +138,7 @@ static void ath_pci_aspm_init(struct ath_common *common) ...@@ -137,7 +138,7 @@ static void ath_pci_aspm_init(struct ath_common *common)
if (aspm & (PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1)) { if (aspm & (PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1)) {
ah->aspm_enabled = true; ah->aspm_enabled = true;
/* Initialize PCIe PM and SERDES registers. */ /* Initialize PCIe PM and SERDES registers. */
ath9k_hw_configpcipowersave(ah, 0, 0); ath9k_hw_configpcipowersave(ah, false);
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册