Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b9cf1be authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

ath9k: merge common ->config_pci_powersave() checks 



Move common checks into wrapper function. Since ASPM can be only enabled
on PCIe devices ->is_pciexpress check is unneeded.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 84c87dc8

drivers/net/wireless/ath/ath9k/ar9002_hw.c

+0 −3
Original line number Diff line number Diff line
@@ -308,9 +308,6 @@ static void ar9002_hw_configpcipowersave(struct ath_hw *ah, 
	u8 i;

	u32 val;



	if (ah->is_pciexpress != true || ah->aspm_enabled != true)

		return;



	/* Nothing to do on restore for 11N */

	if (!power_off /* !restore */) {

		if (AR_SREV_9280_20_OR_LATER(ah)) {

drivers/net/wireless/ath/ath9k/ar9003_hw.c

+0 −3
Original line number Diff line number Diff line
@@ -518,9 +518,6 @@ static void ar9003_hw_init_mode_gain_regs(struct ath_hw *ah) 
static void ar9003_hw_configpcipowersave(struct ath_hw *ah,

					 bool power_off)

{

	if (ah->is_pciexpress != true || ah->aspm_enabled != true)

		return;



	/* Nothing to do on restore for 11N */

	if (!power_off /* !restore */) {

		/* set bit 19 to allow forcing of pcie core into L1 state */

drivers/net/wireless/ath/ath9k/hw-ops.h

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ 
static inline void ath9k_hw_configpcipowersave(struct ath_hw *ah,

					       bool power_off)

{

	if (ah->aspm_enabled != true)

		return;



	ath9k_hw_ops(ah)->config_pci_powersave(ah, power_off);

}