aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSujith Manoharan <c_manoha@qca.qualcomm.com>2012-11-12 00:26:44 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-11-16 14:11:14 -0500
commitb126b02796eaac8534b699571bd4209e05b64146 (patch)
treeb21b2f795de4d78718a92799d320dcefb6886dd9 /drivers
parent413c0303cfbf269cdc7a90653ec15f3cb73cd080 (diff)
ath9k: Remove unused workaround
The workaround for ASPM/L0s is needed only for AR9485 1.0, which was never sold and is not supported by ath9k. Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.c5
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.h3
-rw-r--r--drivers/net/wireless/ath/ath9k/main.c3
-rw-r--r--drivers/net/wireless/ath/ath9k/pci.c12
4 files changed, 0 insertions, 23 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 71cd9f0c96af..756191b9eeda 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -2561,11 +2561,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
2561 pCap->hw_caps |= ATH9K_HW_CAP_ANT_DIV_COMB; 2561 pCap->hw_caps |= ATH9K_HW_CAP_ANT_DIV_COMB;
2562 } 2562 }
2563 2563
2564 if (AR_SREV_9485_10(ah)) {
2565 pCap->pcie_lcr_extsync_en = true;
2566 pCap->pcie_lcr_offset = 0x80;
2567 }
2568
2569 if (ath9k_hw_dfs_tested(ah)) 2564 if (ath9k_hw_dfs_tested(ah))
2570 pCap->hw_caps |= ATH9K_HW_CAP_DFS; 2565 pCap->hw_caps |= ATH9K_HW_CAP_DFS;
2571 2566
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 3e73bfe2315e..bdabbda5a83e 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -273,8 +273,6 @@ struct ath9k_hw_capabilities {
273 u8 rx_status_len; 273 u8 rx_status_len;
274 u8 tx_desc_len; 274 u8 tx_desc_len;
275 u8 txs_len; 275 u8 txs_len;
276 u16 pcie_lcr_offset;
277 bool pcie_lcr_extsync_en;
278}; 276};
279 277
280struct ath9k_ops_config { 278struct ath9k_ops_config {
@@ -930,7 +928,6 @@ struct ath_bus_ops {
930 void (*read_cachesize)(struct ath_common *common, int *csz); 928 void (*read_cachesize)(struct ath_common *common, int *csz);
931 bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data); 929 bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data);
932 void (*bt_coex_prep)(struct ath_common *common); 930 void (*bt_coex_prep)(struct ath_common *common);
933 void (*extn_synch_en)(struct ath_common *common);
934 void (*aspm_init)(struct ath_common *common); 931 void (*aspm_init)(struct ath_common *common);
935}; 932};
936 933
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index c084532291a1..9594b6fcdf06 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -686,9 +686,6 @@ static int ath9k_start(struct ieee80211_hw *hw)
686 686
687 spin_unlock_bh(&sc->sc_pcu_lock); 687 spin_unlock_bh(&sc->sc_pcu_lock);
688 688
689 if (ah->caps.pcie_lcr_extsync_en && common->bus_ops->extn_synch_en)
690 common->bus_ops->extn_synch_en(common);
691
692 mutex_unlock(&sc->mutex); 689 mutex_unlock(&sc->mutex);
693 690
694 ath9k_ps_restore(sc); 691 ath9k_ps_restore(sc);
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index f088f4bf9a26..9553203ee624 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -96,17 +96,6 @@ static bool ath_pci_eeprom_read(struct ath_common *common, u32 off, u16 *data)
96 return true; 96 return true;
97} 97}
98 98
99static void ath_pci_extn_synch_enable(struct ath_common *common)
100{
101 struct ath_softc *sc = (struct ath_softc *) common->priv;
102 struct pci_dev *pdev = to_pci_dev(sc->dev);
103 u8 lnkctl;
104
105 pci_read_config_byte(pdev, sc->sc_ah->caps.pcie_lcr_offset, &lnkctl);
106 lnkctl |= PCI_EXP_LNKCTL_ES;
107 pci_write_config_byte(pdev, sc->sc_ah->caps.pcie_lcr_offset, lnkctl);
108}
109
110/* Need to be called after we discover btcoex capabilities */ 99/* Need to be called after we discover btcoex capabilities */
111static void ath_pci_aspm_init(struct ath_common *common) 100static void ath_pci_aspm_init(struct ath_common *common)
112{ 101{
@@ -153,7 +142,6 @@ static const struct ath_bus_ops ath_pci_bus_ops = {
153 .ath_bus_type = ATH_PCI, 142 .ath_bus_type = ATH_PCI,
154 .read_cachesize = ath_pci_read_cachesize, 143 .read_cachesize = ath_pci_read_cachesize,
155 .eeprom_read = ath_pci_eeprom_read, 144 .eeprom_read = ath_pci_eeprom_read,
156 .extn_synch_en = ath_pci_extn_synch_enable,
157 .aspm_init = ath_pci_aspm_init, 145 .aspm_init = ath_pci_aspm_init,
158}; 146};
159 147