diff options
| author | Wey-Yi Guy | 2009-03-26 18:14:08 +0100 |
|---|---|---|
| committer | John W. Linville | 2009-04-22 22:54:27 +0200 |
| commit | 6da3a13e4fcab0ff58592087d28bd283caf23d88 (patch) | |
| tree | 1b67e34373d8b17ae66a66526cc72dfd6ad067b1 /drivers/net/wireless/iwlwifi/iwl-core.h | |
| parent | p54spi: fix p54spi_tx_frame DMA transfer initiation and skb cleanup (diff) | |
| download | kernel-qcow2-linux-6da3a13e4fcab0ff58592087d28bd283caf23d88.tar.gz kernel-qcow2-linux-6da3a13e4fcab0ff58592087d28bd283caf23d88.tar.xz kernel-qcow2-linux-6da3a13e4fcab0ff58592087d28bd283caf23d88.zip | |
iwlwifi: merge and better support of suspend/resume for iwlagn and iwl3945
With mac80211's help to call stop() and start() in mac80211
suspend/resume function, both iwlagn and iwl3945 no longer calling
stop() and start(); remove un-necessary STATUS_IN_SUSPEND bit from both
header files and functions,
Move apm_ops.stop() function into pci_suspend() to ensure
DMA is stopped before go into suspend mode.
iwl3945 has the similar suspend/resume function as iwlagn, so move both
functions to iwlcore to be shared by both drivers.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index a8eac8c3c1fa..5d4904584686 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h @@ -432,6 +432,10 @@ static inline u16 iwl_pcie_link_ctl(struct iwl_priv *priv) pci_read_config_word(priv->pci_dev, pos + PCI_EXP_LNKCTL, &pci_lnk_ctl); return pci_lnk_ctl; } +#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 */ /***************************************************** * Error Handling Debugging @@ -458,7 +462,6 @@ void iwlcore_free_geos(struct iwl_priv *priv); #define STATUS_TEMPERATURE 8 #define STATUS_GEO_CONFIGURED 9 #define STATUS_EXIT_PENDING 10 -#define STATUS_IN_SUSPEND 11 #define STATUS_STATISTICS 12 #define STATUS_SCANNING 13 #define STATUS_SCAN_ABORTING 14 |