2010-12-14 02:43:30

by Sujith

Subject: [PATCH] ath9k_htc: Remove PCI specific configuration

From: Sujith Manoharan <[email protected]>

There is no need to configure PCI related registers for
USB devices.

Signed-off-by: Sujith Manoharan <[email protected]>
---
drivers/net/wireless/ath/ath9k/htc_drv_main.c | 4 ----
drivers/net/wireless/ath/ath9k/hw.c | 8 +++++---
2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 20ea75a..dd17909 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1170,9 +1170,6 @@ static int ath9k_htc_start(struct ieee80211_hw *hw)
/* setup initial channel */
init_channel = ath9k_cmn_get_curchannel(hw, ah);

- /* Reset SERDES registers */
- ath9k_hw_configpcipowersave(ah, 0, 0);
-
ath9k_hw_htc_resetinit(ah);
ret = ath9k_hw_reset(ah, init_channel, ah->caldata, false);
if (ret) {
@@ -1258,7 +1255,6 @@ static void ath9k_htc_stop(struct ieee80211_hw *hw)

ath9k_hw_phy_disable(ah);
ath9k_hw_disable(ah);
- ath9k_hw_configpcipowersave(ah, 1, 1);
ath9k_htc_ps_restore(priv);
ath9k_htc_setpower(priv, ATH9K_PM_FULL_SLEEP);

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 0f373be..2662553 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -568,10 +568,12 @@ static int __ath9k_hw_init(struct ath_hw *ah)
ah->WARegVal |= (AR_WA_D3_L1_DISABLE |
AR_WA_ASPM_TIMER_BASED_DISABLE);

- if (ah->is_pciexpress)
+ if (ah->is_pciexpress) {
ath9k_hw_configpcipowersave(ah, 0, 0);
- else
- ath9k_hw_disablepcie(ah);
+ } else {
+ if (common->bus_ops->ath_bus_type != ATH_USB)
+ ath9k_hw_disablepcie(ah);
+ }

if (!AR_SREV_9300_20_OR_LATER(ah))
ar9002_hw_cck_chan14_spread(ah);
--
1.7.3.3

2010-12-14 10:48:18

by Felix Fietkau

Subject: Re: [PATCH] ath9k_htc: Remove PCI specific configuration

On 2010-12-14 3:42 AM, Sujith wrote:
> From: Sujith Manoharan <[email protected]>
>
> There is no need to configure PCI related registers for
> USB devices.
>
> Signed-off-by: Sujith Manoharan <[email protected]>
> ---
> diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
> index 0f373be..2662553 100644
> --- a/drivers/net/wireless/ath/ath9k/hw.c
> +++ b/drivers/net/wireless/ath/ath9k/hw.c
> @@ -568,10 +568,12 @@ static int __ath9k_hw_init(struct ath_hw *ah)
> ah->WARegVal |= (AR_WA_D3_L1_DISABLE |
> AR_WA_ASPM_TIMER_BASED_DISABLE);
>
> - if (ah->is_pciexpress)
> + if (ah->is_pciexpress) {
> ath9k_hw_configpcipowersave(ah, 0, 0);
> - else
> - ath9k_hw_disablepcie(ah);
> + } else {
> + if (common->bus_ops->ath_bus_type != ATH_USB)
> + ath9k_hw_disablepcie(ah);
> + }
I don't really see the point of this check, since (with my other patch)
ath9k_hw_disablepcie already checks for AR_SREV_5416, which won't return
true on any USB based device.

- Felix