diff options
| author | Emmanuel Grumbach | 2011-08-26 08:11:16 +0200 |
|---|---|---|
| committer | John W. Linville | 2011-08-29 21:30:30 +0200 |
| commit | 332a4bad975616f33c2d1bf94c4ace2ea4113835 (patch) | |
| tree | 86e5625342ae6c30690710b8620b946a5fbc672d /drivers/net/wireless/iwlwifi/iwl-pci.c | |
| parent | iwlagn: fix compile warnings when CONFIG_PM_SLEEP is not set (diff) | |
| download | kernel-qcow2-linux-332a4bad975616f33c2d1bf94c4ace2ea4113835.tar.gz kernel-qcow2-linux-332a4bad975616f33c2d1bf94c4ace2ea4113835.tar.xz kernel-qcow2-linux-332a4bad975616f33c2d1bf94c4ace2ea4113835.zip | |
iwlagn: iwl-pci doesn't include iwl-dev any more
Move all the iwlXXX_abgn_cfg forward declaration to a separate file
so that iwl-pci.c doesn't need to include iwl-agn.h that includes
all iwl-dev.h
This allows to provide real encapsulation. Dereferencing iwl_priv
in the bus layer will now lead to a compilation error.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-pci.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-pci.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c index 62c35a5fea80..7210ff68ffbc 100644 --- a/drivers/net/wireless/iwlwifi/iwl-pci.c +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c @@ -64,13 +64,11 @@ #include <linux/pci-aspm.h> #include "iwl-bus.h" +#include "iwl-io.h" #include "iwl-shared.h" -#include "iwl-agn.h" #include "iwl-trans.h" - -/* TODO: iwl_set_bit and friends should be implemented in bus layer - * this would allow us not to include iwl-io.h here */ -#include "iwl-io.h" +#include "iwl-csr.h" +#include "iwl-pci.h" /* PCI registers */ #define PCI_CFG_RETRY_TIMEOUT 0x041 @@ -95,6 +93,7 @@ static u16 iwl_pciexp_link_ctrl(struct iwl_bus *bus) { int pos; u16 pci_lnk_ctl; + struct pci_dev *pci_dev = IWL_BUS_GET_PCI_DEV(bus); pos = pci_pcie_cap(pci_dev); |