ath9k: Remove ATH9K_HW_WOW_DEVICE_CAPABLE

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Enabling WOW based on the chip is incorrect since
it needs to be done for specific sub-devices which
have proper platform support.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

authored by

Sujith Manoharan and committed by

Kalle Valo 11 years ago 4895efc9 fc8f0456

+1 -8

3 changed files

expand all

drivers

net

wireless

ath

ath9k

hw.c

hw.h

wow.c

-3

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

··· 2544 2544 pCap->hw_caps |= ATH9K_HW_CAP_RTT; 2545 2545 } 2546 2546 2547 - if (AR_SREV_9462(ah)) 2548 - pCap->hw_caps |= ATH9K_HW_WOW_DEVICE_CAPABLE; 2549 - 2550 2547 if (AR_SREV_9300_20_OR_LATER(ah) && 2551 2548 ah->eep_ops->get_eeprom(ah, EEP_PAPRD)) 2552 2549 pCap->hw_caps |= ATH9K_HW_CAP_PAPRD;

-2

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

··· 248 248 #ifdef CONFIG_ATH9K_PCOEM 249 249 ATH9K_HW_CAP_RTT = BIT(14), 250 250 ATH9K_HW_CAP_MCI = BIT(15), 251 - ATH9K_HW_WOW_DEVICE_CAPABLE = BIT(16), 252 251 ATH9K_HW_CAP_BT_ANT_DIV = BIT(17), 253 252 #else 254 253 ATH9K_HW_CAP_RTT = 0, 255 254 ATH9K_HW_CAP_MCI = 0, 256 - ATH9K_HW_WOW_DEVICE_CAPABLE = 0, 257 255 ATH9K_HW_CAP_BT_ANT_DIV = 0, 258 256 #endif 259 257 ATH9K_HW_CAP_DFS = BIT(18),

+1 -3

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

··· 352 352 { 353 353 struct ath_softc *sc = hw->priv; 354 354 355 - if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_WOW_DEVICE_CAPABLE) && 356 - (sc->driver_data & ATH9K_PCI_WOW) && 357 - device_can_wakeup(sc->dev)) 355 + if ((sc->driver_data & ATH9K_PCI_WOW) && device_can_wakeup(sc->dev)) 358 356 hw->wiphy->wowlan = &ath9k_wowlan_support; 359 357 360 358 atomic_set(&sc->wow_sleep_proc_intr, -1);