aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-07-21 21:03:42 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-24 15:05:30 -0400
commitccc78ec5d463e6c99f4a384be52b31222ffe2e21 (patch)
treeae324854934a678c173fb14cbf82173062963471 /drivers/net
parent95a2b2ef82dc0bd10475c02e9d1fc7c93e708d03 (diff)
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.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index ecc93834533f..5695911bc602 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)
1964#ifdef CONFIG_PM 1964#ifdef CONFIG_PM
1965static int adm8211_suspend(struct pci_dev *pdev, pm_message_t state) 1965static int adm8211_suspend(struct pci_dev *pdev, pm_message_t state)
1966{ 1966{
1967 struct ieee80211_hw *dev = pci_get_drvdata(pdev);
1968 struct adm8211_priv *priv = dev->priv;
1969
1970 if (priv->mode != NL80211_IFTYPE_UNSPECIFIED) {
1971 ieee80211_stop_queues(dev);
1972 adm8211_stop(dev);
1973 }
1974
1975 pci_save_state(pdev); 1967 pci_save_state(pdev);
1976 pci_set_power_state(pdev, pci_choose_state(pdev, state)); 1968 pci_set_power_state(pdev, pci_choose_state(pdev, state));
1977 return 0; 1969 return 0;
@@ -1979,17 +1971,8 @@ static int adm8211_suspend(struct pci_dev *pdev, pm_message_t state)
1979 1971
1980static int adm8211_resume(struct pci_dev *pdev) 1972static int adm8211_resume(struct pci_dev *pdev)
1981{ 1973{
1982 struct ieee80211_hw *dev = pci_get_drvdata(pdev);
1983 struct adm8211_priv *priv = dev->priv;
1984
1985 pci_set_power_state(pdev, PCI_D0); 1974 pci_set_power_state(pdev, PCI_D0);
1986 pci_restore_state(pdev); 1975 pci_restore_state(pdev);
1987
1988 if (priv->mode != NL80211_IFTYPE_UNSPECIFIED) {
1989 adm8211_start(dev);
1990 ieee80211_wake_queues(dev);
1991 }
1992
1993 return 0; 1976 return 0;
1994} 1977}
1995#endif /* CONFIG_PM */ 1978#endif /* CONFIG_PM */