diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-05-31 09:07:00 +0300 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-06-18 08:07:14 -0700 |
| commit | 084dd79172cb3aad11d2b7ee5628d57badca7c6e (patch) | |
| tree | b59d649192927c120ee59b7e4575af695a1d09f4 /drivers/net/wireless/iwlwifi/iwl-io.h | |
| parent | 3599d39a8525b01540e2c7ec8c5d0df0dd11d6cf (diff) | |
| download | blackbird-op-linux-084dd79172cb3aad11d2b7ee5628d57badca7c6e.tar.gz blackbird-op-linux-084dd79172cb3aad11d2b7ee5628d57badca7c6e.zip | |
iwlagn: move PCI related operations from probe and remove to PCI layer
Since we have now a PCI layer, all the init and deinit code that is PCI
related should move to there.
Also move the IO functions: read8/read32/write32. They need hw_base which
is killed from priv.
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-io.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-io.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h index 869edc580ec6..c56eae74c3cd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-io.h +++ b/drivers/net/wireless/iwlwifi/iwl-io.h @@ -38,18 +38,18 @@ static inline void iwl_write8(struct iwl_priv *priv, u32 ofs, u8 val) { trace_iwlwifi_dev_iowrite8(priv, ofs, val); - iowrite8(val, priv->hw_base + ofs); + priv->bus.ops->write8(&priv->bus, ofs, val); } static inline void iwl_write32(struct iwl_priv *priv, u32 ofs, u32 val) { trace_iwlwifi_dev_iowrite32(priv, ofs, val); - iowrite32(val, priv->hw_base + ofs); + priv->bus.ops->write32(&priv->bus, ofs, val); } static inline u32 iwl_read32(struct iwl_priv *priv, u32 ofs) { - u32 val = ioread32(priv->hw_base + ofs); + u32 val = priv->bus.ops->read32(&priv->bus, ofs); trace_iwlwifi_dev_ioread32(priv, ofs, val); return val; } |
