diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-10-25 16:12:37 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-15 13:24:40 -0500 |
| commit | f60dc0138aa19769bf8bab9f93b043235428b66f (patch) | |
| tree | 91e71125d93ddb22a2f7241c27b74de1460303ee /drivers/net/wireless/iwlwifi/iwl-core.h | |
| parent | b9237578f8d685bb86901ba9ff0d379218e5a3c5 (diff) | |
iwlwifi: Convert to new PCI PM framework
Use the new PCI PM and let the PCI core code handle the PCI-specific
details of power transitions.
Based on similarly titled ath9k patch posted by Rafael J. Wysocki.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 64527def059f..b17de8214eb5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h @@ -615,9 +615,17 @@ __le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base, u32 addon, u32 beacon_interval); #ifdef CONFIG_PM -int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state); -int iwl_pci_resume(struct pci_dev *pdev); -#endif /* CONFIG_PM */ +int iwl_pci_suspend(struct device *device); +int iwl_pci_resume(struct device *device); +extern const struct dev_pm_ops iwl_pm_ops; + +#define IWL_PM_OPS (&iwl_pm_ops) + +#else /* !CONFIG_PM */ + +#define IWL_PM_OPS NULL + +#endif /* !CONFIG_PM */ /***************************************************** * Error Handling Debugging |