leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ath9k: Remove unused BMISS processing

Browse Source 
The various variables tracking bmiss interrupts
are not really used anywhere except in a debug
message. Remove them since they have no functional
purpose.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Sujith Manoharan
2015-01-30 19:05:28 +05:30
committed by Kalle Valo
parent 249943a221
commit c4d0975bba
3 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/ath9k/ath9k.h
View File

@@ -1043,8 +1043,6 @@ struct ath_softc {
s16 tx99_power; s16 tx99_power;
#ifdef CONFIG_ATH9K_WOW #ifdef CONFIG_ATH9K_WOW
atomic_t wow_got_bmiss_intr;
atomic_t wow_sleep_proc_intr; /* in the middle of WoW sleep ? */
u32 wow_intr_before_sleep; u32 wow_intr_before_sleep;
#endif #endif
}; };

9
drivers/net/wireless/ath/ath9k/main.c
View File

@@ -556,15 +556,6 @@ irqreturn_t ath_isr(int irq, void *dev)
(status & ATH9K_INT_BB_WATCHDOG)) (status & ATH9K_INT_BB_WATCHDOG))
goto chip_reset; goto chip_reset;
#ifdef CONFIG_ATH9K_WOW
if (status & ATH9K_INT_BMISS) {
if (atomic_read(&sc->wow_sleep_proc_intr) == 0) {
atomic_inc(&sc->wow_got_bmiss_intr);
atomic_dec(&sc->wow_sleep_proc_intr);
}
}
#endif
if (status & ATH9K_INT_SWBA) if (status & ATH9K_INT_SWBA)
tasklet_schedule(&sc->bcon_tasklet); tasklet_schedule(&sc->bcon_tasklet);

18
drivers/net/wireless/ath/ath9k/wow.c
View File

@@ -269,7 +269,6 @@ int ath9k_suspend(struct ieee80211_hw *hw,
ath9k_ps_restore(sc); ath9k_ps_restore(sc);
ath_dbg(common, WOW, "Suspend with WoW triggers: 0x%x\n", triggers); ath_dbg(common, WOW, "Suspend with WoW triggers: 0x%x\n", triggers);
atomic_inc(&sc->wow_sleep_proc_intr);
set_bit(ATH_OP_WOW_ENABLED, &common->op_flags); set_bit(ATH_OP_WOW_ENABLED, &common->op_flags);
fail_wow: fail_wow:
@@ -299,19 +298,6 @@ int ath9k_resume(struct ieee80211_hw *hw)
wow_status = ath9k_hw_wow_wakeup(ah); wow_status = ath9k_hw_wow_wakeup(ah);
if (atomic_read(&sc->wow_got_bmiss_intr) == 0) {
/*
* some devices may not pick beacon miss
* as the reason they woke up so we add
* that here for that shortcoming.
*/
wow_status |= AH_WOW_BEACON_MISS;
atomic_dec(&sc->wow_got_bmiss_intr);
ath_dbg(common, ANY, "Beacon miss interrupt picked up during WoW sleep\n");
}
atomic_dec(&sc->wow_sleep_proc_intr);
if (wow_status) { if (wow_status) {
ath_dbg(common, ANY, "Waking up due to WoW triggers %s with WoW status = %x\n", ath_dbg(common, ANY, "Waking up due to WoW triggers %s with WoW status = %x\n",
ath9k_hw_wow_event_to_string(wow_status), wow_status); ath9k_hw_wow_event_to_string(wow_status), wow_status);
@@ -347,10 +333,6 @@ void ath9k_init_wow(struct ieee80211_hw *hw)
if (sc->driver_data & ATH9K_PCI_WOW) { if (sc->driver_data & ATH9K_PCI_WOW) {
hw->wiphy->wowlan = &ath9k_wowlan_support; hw->wiphy->wowlan = &ath9k_wowlan_support;
atomic_set(&sc->wow_sleep_proc_intr, -1);
atomic_set(&sc->wow_got_bmiss_intr, -1);
device_init_wakeup(sc->dev, 1); device_init_wakeup(sc->dev, 1);
} }
} }