diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-07-21 21:03:42 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-07-24 15:05:30 -0400 |
| commit | ccc78ec5d463e6c99f4a384be52b31222ffe2e21 (patch) | |
| tree | ae324854934a678c173fb14cbf82173062963471 /drivers/net | |
| parent | 95a2b2ef82dc0bd10475c02e9d1fc7c93e708d03 (diff) | |
| download | linux-3.10-ccc78ec5d463e6c99f4a384be52b31222ffe2e21.tar.gz linux-3.10-ccc78ec5d463e6c99f4a384be52b31222ffe2e21.tar.bz2 linux-3.10-ccc78ec5d463e6c99f4a384be52b31222ffe2e21.zip | |
adm8211: remove uneeded code during suspend/resume
mac80211 drivers do not need to stop the software queues
or call their own stop() callback upon suspend as we do it
for drivers. Equally drivers don't have to call their own
start() or start the queues as mac80211 will do it for us.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/adm8211.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c index ecc93834533..5695911bc60 100644 --- a/drivers/net/wireless/adm8211.c +++ b/drivers/net/wireless/adm8211.c @@ -1964,14 +1964,6 @@ static void __devexit adm8211_remove(struct pci_dev *pdev) #ifdef CONFIG_PM static int adm8211_suspend(struct pci_dev *pdev, pm_message_t state) { - struct ieee80211_hw *dev = pci_get_drvdata(pdev); - struct adm8211_priv *priv = dev->priv; - - if (priv->mode != NL80211_IFTYPE_UNSPECIFIED) { - ieee80211_stop_queues(dev); - adm8211_stop(dev); - } - pci_save_state(pdev); pci_set_power_state(pdev, pci_choose_state(pdev, state)); return 0; @@ -1979,17 +1971,8 @@ static int adm8211_suspend(struct pci_dev *pdev, pm_message_t state) static int adm8211_resume(struct pci_dev *pdev) { - struct ieee80211_hw *dev = pci_get_drvdata(pdev); - struct adm8211_priv *priv = dev->priv; - pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); - - if (priv->mode != NL80211_IFTYPE_UNSPECIFIED) { - adm8211_start(dev); - ieee80211_wake_queues(dev); - } - return 0; } #endif /* CONFIG_PM */ |