diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-10-11 21:28:47 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-10-14 14:48:14 -0400 |
| commit | 603be3885b9d518ff4822b357e2687b6ff02f1ac (patch) | |
| tree | 69b87f3878235bd1e5032cfba9ccdc5a37e80130 /drivers/net/wireless/rtlwifi/pci.c | |
| parent | 7f2a5e214d3f8daf1e9a5ad021c74528f970e673 (diff) | |
| download | linux-603be3885b9d518ff4822b357e2687b6ff02f1ac.tar.gz linux-603be3885b9d518ff4822b357e2687b6ff02f1ac.tar.bz2 linux-603be3885b9d518ff4822b357e2687b6ff02f1ac.zip | |
rtlwifi: Change PCI drivers to use the new PM framework
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/pci.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/pci.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index 9983fa18065a..5380f3b040ac 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c @@ -1993,36 +1993,25 @@ call rtl_mac_stop() from the mac80211 suspend function first, So there is no need to call hw_disable here. ****************************************/ -int rtl_pci_suspend(struct pci_dev *pdev, pm_message_t state) +int rtl_pci_suspend(struct device *dev) { + struct pci_dev *pdev = to_pci_dev(dev); struct ieee80211_hw *hw = pci_get_drvdata(pdev); struct rtl_priv *rtlpriv = rtl_priv(hw); rtlpriv->cfg->ops->hw_suspend(hw); rtl_deinit_rfkill(hw); - pci_save_state(pdev); - pci_disable_device(pdev); - pci_set_power_state(pdev, PCI_D3hot); return 0; } EXPORT_SYMBOL(rtl_pci_suspend); -int rtl_pci_resume(struct pci_dev *pdev) +int rtl_pci_resume(struct device *dev) { - int ret; + struct pci_dev *pdev = to_pci_dev(dev); struct ieee80211_hw *hw = pci_get_drvdata(pdev); struct rtl_priv *rtlpriv = rtl_priv(hw); - pci_set_power_state(pdev, PCI_D0); - ret = pci_enable_device(pdev); - if (ret) { - RT_ASSERT(false, ("ERR: <======\n")); - return ret; - } - - pci_restore_state(pdev); - rtlpriv->cfg->ops->hw_resume(hw); rtl_init_rfkill(hw); return 0; |