Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccc78ec5 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

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: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 95a2b2ef

drivers/net/wireless/adm8211.c

+0 −17
Original line number Diff line number Diff line
@@ -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 */