diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-05-24 04:39:02 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-06-18 11:05:23 -0400 |
commit | 48d1a2110ad9cb86e5cb0d790729824fa3cca83b (patch) | |
tree | 873a8c8840d0c2257ece3960043c080a95c8e422 /drivers/net/wireless/iwlwifi/iwl-core.h | |
parent | 7299751df36c02adafb5b897c56de71f0d7e2cb5 (diff) |
iwlagn: add a iwl_pci.[ch] files that will contain all PCI specific code
Move some PCI functionality to the new iwl_pci.[ch] files:
* the PCI_DEVICE_TABLE
* the pci_driver struct definition
* the PCI probe / remove functions
* the PCI suspend / resume functions
All these functions are now split: the trigger comes from the PCI layer which
calls to the bus generic code located in the other files.
This is the beginning only. There are still a lot of PCI related code needs
to be gathered.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-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 | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index 84f28e10631..84032bbfefd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -76,11 +76,6 @@ struct iwl_cmd; | |||
76 | #define DRV_COPYRIGHT "Copyright(c) 2003-2011 Intel Corporation" | 76 | #define DRV_COPYRIGHT "Copyright(c) 2003-2011 Intel Corporation" |
77 | #define DRV_AUTHOR "<ilw@linux.intel.com>" | 77 | #define DRV_AUTHOR "<ilw@linux.intel.com>" |
78 | 78 | ||
79 | #define IWL_PCI_DEVICE(dev, subdev, cfg) \ | ||
80 | .vendor = PCI_VENDOR_ID_INTEL, .device = (dev), \ | ||
81 | .subvendor = PCI_ANY_ID, .subdevice = (subdev), \ | ||
82 | .driver_data = (kernel_ulong_t)&(cfg) | ||
83 | |||
84 | #define TIME_UNIT 1024 | 79 | #define TIME_UNIT 1024 |
85 | 80 | ||
86 | #define IWL_CMD(x) case x: return #x | 81 | #define IWL_CMD(x) case x: return #x |
@@ -495,16 +490,8 @@ __le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base, | |||
495 | u32 addon, u32 beacon_interval); | 490 | u32 addon, u32 beacon_interval); |
496 | 491 | ||
497 | #ifdef CONFIG_PM | 492 | #ifdef CONFIG_PM |
498 | int iwl_pci_suspend(struct device *device); | 493 | int iwl_suspend(struct iwl_priv *priv); |
499 | int iwl_pci_resume(struct device *device); | 494 | int iwl_resume(struct iwl_priv *priv); |
500 | extern const struct dev_pm_ops iwl_pm_ops; | ||
501 | |||
502 | #define IWL_PM_OPS (&iwl_pm_ops) | ||
503 | |||
504 | #else /* !CONFIG_PM */ | ||
505 | |||
506 | #define IWL_PM_OPS NULL | ||
507 | |||
508 | #endif /* !CONFIG_PM */ | 495 | #endif /* !CONFIG_PM */ |
509 | 496 | ||
510 | /***************************************************** | 497 | /***************************************************** |