ath9k: Remove unused BMISS processing

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>

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 4209d7baf1d4f2668dff7a6c7c0249fbe26d4f21..803a7d4ff1b2b73c518302065db78ecb739367ce 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -1043,8 +1043,6 @@ struct ath_softc {
        s16 tx99_power;
 
 #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;
 #endif
 };

diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 9a72640237cb7678500468343e6f09101c169e81..98b1e4aa150658adb06577b4d6bee13b7eaf3f08 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -556,15 +556,6 @@ irqreturn_t ath_isr(int irq, void *dev)
            (status & ATH9K_INT_BB_WATCHDOG))
                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)
                tasklet_schedule(&sc->bcon_tasklet);
 

diff --git a/drivers/net/wireless/ath/ath9k/wow.c b/drivers/net/wireless/ath/ath9k/wow.c
index c0c564de982e1352dff1f918f7cc974baa5a07d0..fa60dbb0bf14674613968805a2fec6ebaabcd206 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/wow.c
+++ b/drivers/net/wireless/ath/ath9k/wow.c
@@ -269,7 +269,6 @@ int ath9k_suspend(struct ieee80211_hw *hw,
 
        ath9k_ps_restore(sc);
        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);
 fail_wow:
@@ -299,19 +298,6 @@ int ath9k_resume(struct ieee80211_hw *hw)
 
        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) {
                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);
@@ -347,10 +333,6 @@ void ath9k_init_wow(struct ieee80211_hw *hw)
 
        if (sc->driver_data & ATH9K_PCI_WOW) {
                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);
        }
 }