diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-01-03 06:48:07 -0500 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-02-02 17:35:38 -0500 |
commit | 0390549571cb614ac5cd3327b63f95155a75c673 (patch) | |
tree | 071b5eb231ba835f3b4da2b1347f1d0673bd3deb /drivers/net/wireless/iwlwifi/iwl-pci.c | |
parent | a42a184458ae95937893cb873c988385637c5e14 (diff) |
iwlwifi: the read / write register ops move to transport
Most of the accesses to the registers are done from the transport layer.
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-pci.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-pci.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c index 631b67ca2b6b..ab462337d7a7 100644 --- a/drivers/net/wireless/iwlwifi/iwl-pci.c +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c | |||
@@ -79,9 +79,6 @@ | |||
79 | struct iwl_pci_bus { | 79 | struct iwl_pci_bus { |
80 | /* basic pci-network driver stuff */ | 80 | /* basic pci-network driver stuff */ |
81 | struct pci_dev *pci_dev; | 81 | struct pci_dev *pci_dev; |
82 | |||
83 | /* pci hardware address support */ | ||
84 | void __iomem *hw_base; | ||
85 | }; | 82 | }; |
86 | 83 | ||
87 | #define IWL_BUS_GET_PCI_BUS(_iwl_bus) \ | 84 | #define IWL_BUS_GET_PCI_BUS(_iwl_bus) \ |
@@ -151,30 +148,11 @@ static u32 iwl_pci_get_hw_id(struct iwl_bus *bus) | |||
151 | return (pci_dev->device << 16) + pci_dev->subsystem_device; | 148 | return (pci_dev->device << 16) + pci_dev->subsystem_device; |
152 | } | 149 | } |
153 | 150 | ||
154 | static void iwl_pci_write8(struct iwl_bus *bus, u32 ofs, u8 val) | ||
155 | { | ||
156 | iowrite8(val, IWL_BUS_GET_PCI_BUS(bus)->hw_base + ofs); | ||
157 | } | ||
158 | |||
159 | static void iwl_pci_write32(struct iwl_bus *bus, u32 ofs, u32 val) | ||
160 | { | ||
161 | iowrite32(val, IWL_BUS_GET_PCI_BUS(bus)->hw_base + ofs); | ||
162 | } | ||
163 | |||
164 | static u32 iwl_pci_read32(struct iwl_bus *bus, u32 ofs) | ||
165 | { | ||
166 | u32 val = ioread32(IWL_BUS_GET_PCI_BUS(bus)->hw_base + ofs); | ||
167 | return val; | ||
168 | } | ||
169 | |||
170 | static const struct iwl_bus_ops bus_ops_pci = { | 151 | static const struct iwl_bus_ops bus_ops_pci = { |
171 | .get_pm_support = iwl_pci_is_pm_supported, | 152 | .get_pm_support = iwl_pci_is_pm_supported, |
172 | .apm_config = iwl_pci_apm_config, | 153 | .apm_config = iwl_pci_apm_config, |
173 | .get_hw_id_string = iwl_pci_get_hw_id_string, | 154 | .get_hw_id_string = iwl_pci_get_hw_id_string, |
174 | .get_hw_id = iwl_pci_get_hw_id, | 155 | .get_hw_id = iwl_pci_get_hw_id, |
175 | .write8 = iwl_pci_write8, | ||
176 | .write32 = iwl_pci_write32, | ||
177 | .read32 = iwl_pci_read32, | ||
178 | }; | 156 | }; |
179 | 157 | ||
180 | #define IWL_PCI_DEVICE(dev, subdev, cfg) \ | 158 | #define IWL_PCI_DEVICE(dev, subdev, cfg) \ |