1 files changed, 128 insertions, 128 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-io.h b/drivers/net/wireless/iwlwifi/iwl-4965-io.h
index 5c497e4beea2..34a0b57eea0c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-io.h
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-io.h
@@ -26,8 +26,8 @@
  *
  *****************************************************************************/
 
-#ifndef __iwl_io_h__
-#define __iwl_io_h__
+#ifndef __iwl4965_io_h__
+#define __iwl4965_io_h__
 
 #include <linux/io.h>
 
@@ -49,8 +49,8 @@
  *
  * If you wish to call the function without any debug or state checking,
  * you should use the single _ prefix version (as is used by dependent IO
- * routines, for example _iwl_read_direct32 calls the non-check version of
- * _iwl_read32.)
+ * routines, for example _iwl4965_read_direct32 calls the non-check version of
+ * _iwl4965_read32.)
  *
  * These declarations are *extremely* useful in quickly isolating code deltas
  * which result in misconfiguring of the hardware I/O.  In combination with
@@ -59,39 +59,39 @@
  *
  */
 
-#define _iwl_write32(iwl, ofs, val) writel((val), (iwl)->hw_base + (ofs))
+#define _iwl4965_write32(iwl, ofs, val) writel((val), (iwl)->hw_base + (ofs))
 #ifdef CONFIG_IWL4965_DEBUG
-static inline void __iwl_write32(const char *f, u32 l, struct iwl_priv *iwl,
+static inline void __iwl4965_write32(const char *f, u32 l, struct iwl4965_priv *iwl,
                                  u32 ofs, u32 val)
 {
         IWL_DEBUG_IO("write32(0x%08X, 0x%08X) - %s %d\n", ofs, val, f, l);
-        _iwl_write32(iwl, ofs, val);
+        _iwl4965_write32(iwl, ofs, val);
 }
-#define iwl_write32(iwl, ofs, val) \
-        __iwl_write32(__FILE__, __LINE__, iwl, ofs, val)
+#define iwl4965_write32(iwl, ofs, val) \
+        __iwl4965_write32(__FILE__, __LINE__, iwl, ofs, val)
 #else
-#define iwl_write32(iwl, ofs, val) _iwl_write32(iwl, ofs, val)
+#define iwl4965_write32(iwl, ofs, val) _iwl4965_write32(iwl, ofs, val)
 #endif
 
-#define _iwl_read32(iwl, ofs) readl((iwl)->hw_base + (ofs))
+#define _iwl4965_read32(iwl, ofs) readl((iwl)->hw_base + (ofs))
 #ifdef CONFIG_IWL4965_DEBUG
-static inline u32 __iwl_read32(char *f, u32 l, struct iwl_priv *iwl, u32 ofs)
+static inline u32 __iwl4965_read32(char *f, u32 l, struct iwl4965_priv *iwl, u32 ofs)
 {
         IWL_DEBUG_IO("read_direct32(0x%08X) - %s %d\n", ofs, f, l);
-        return _iwl_read32(iwl, ofs);
+        return _iwl4965_read32(iwl, ofs);
 }
-#define iwl_read32(iwl, ofs) __iwl_read32(__FILE__, __LINE__, iwl, ofs)
+#define iwl4965_read32(iwl, ofs) __iwl4965_read32(__FILE__, __LINE__, iwl, ofs)
 #else
-#define iwl_read32(p, o) _iwl_read32(p, o)
+#define iwl4965_read32(p, o) _iwl4965_read32(p, o)
 #endif
 
-static inline int _iwl_poll_bit(struct iwl_priv *priv, u32 addr,
+static inline int _iwl4965_poll_bit(struct iwl4965_priv *priv, u32 addr,
                                 u32 bits, u32 mask, int timeout)
 {
         int i = 0;
 
         do {
-                if ((_iwl_read32(priv, addr) & mask) == (bits & mask))
+                if ((_iwl4965_read32(priv, addr) & mask) == (bits & mask))
                         return i;
                 mdelay(10);
                 i += 10;
@@ -100,11 +100,11 @@ static inline int _iwl_poll_bit(struct iwl_priv *priv, u32 addr,
         return -ETIMEDOUT;
 }
 #ifdef CONFIG_IWL4965_DEBUG
-static inline int __iwl_poll_bit(const char *f, u32 l,
-                                 struct iwl_priv *priv, u32 addr,
+static inline int __iwl4965_poll_bit(const char *f, u32 l,
+                                 struct iwl4965_priv *priv, u32 addr,
                                  u32 bits, u32 mask, int timeout)
 {
-        int ret = _iwl_poll_bit(priv, addr, bits, mask, timeout);
+        int ret = _iwl4965_poll_bit(priv, addr, bits, mask, timeout);
         if (unlikely(ret  == -ETIMEDOUT))
                 IWL_DEBUG_IO
                     ("poll_bit(0x%08X, 0x%08X, 0x%08X) - timedout - %s %d\n",
@@ -115,47 +115,47 @@ static inline int __iwl_poll_bit(const char *f, u32 l,
                      addr, bits, mask, ret, f, l);
         return ret;
 }
-#define iwl_poll_bit(iwl, addr, bits, mask, timeout) \
-        __iwl_poll_bit(__FILE__, __LINE__, iwl, addr, bits, mask, timeout)
+#define iwl4965_poll_bit(iwl, addr, bits, mask, timeout) \
+        __iwl4965_poll_bit(__FILE__, __LINE__, iwl, addr, bits, mask, timeout)
 #else
-#define iwl_poll_bit(p, a, b, m, t) _iwl_poll_bit(p, a, b, m, t)
+#define iwl4965_poll_bit(p, a, b, m, t) _iwl4965_poll_bit(p, a, b, m, t)
 #endif
 
-static inline void _iwl_set_bit(struct iwl_priv *priv, u32 reg, u32 mask)
+static inline void _iwl4965_set_bit(struct iwl4965_priv *priv, u32 reg, u32 mask)
 {
-        _iwl_write32(priv, reg, _iwl_read32(priv, reg) | mask);
+        _iwl4965_write32(priv, reg, _iwl4965_read32(priv, reg) | mask);
 }
 #ifdef CONFIG_IWL4965_DEBUG
-static inline void __iwl_set_bit(const char *f, u32 l,
-                                 struct iwl_priv *priv, u32 reg, u32 mask)
+static inline void __iwl4965_set_bit(const char *f, u32 l,
+                                 struct iwl4965_priv *priv, u32 reg, u32 mask)
 {
-        u32 val = _iwl_read32(priv, reg) | mask;
+        u32 val = _iwl4965_read32(priv, reg) | mask;
         IWL_DEBUG_IO("set_bit(0x%08X, 0x%08X) = 0x%08X\n", reg, mask, val);
-        _iwl_write32(priv, reg, val);
+        _iwl4965_write32(priv, reg, val);
 }
-#define iwl_set_bit(p, r, m) __iwl_set_bit(__FILE__, __LINE__, p, r, m)
+#define iwl4965_set_bit(p, r, m) __iwl4965_set_bit(__FILE__, __LINE__, p, r, m)
 #else
-#define iwl_set_bit(p, r, m) _iwl_set_bit(p, r, m)
+#define iwl4965_set_bit(p, r, m) _iwl4965_set_bit(p, r, m)
 #endif
 
-static inline void _iwl_clear_bit(struct iwl_priv *priv, u32 reg, u32 mask)
+static inline void _iwl4965_clear_bit(struct iwl4965_priv *priv, u32 reg, u32 mask)
 {
-        _iwl_write32(priv, reg, _iwl_read32(priv, reg) & ~mask);
+        _iwl4965_write32(priv, reg, _iwl4965_read32(priv, reg) & ~mask);
 }
 #ifdef CONFIG_IWL4965_DEBUG
-static inline void __iwl_clear_bit(const char *f, u32 l,
-                                   struct iwl_priv *priv, u32 reg, u32 mask)
+static inline void __iwl4965_clear_bit(const char *f, u32 l,
+                                   struct iwl4965_priv *priv, u32 reg, u32 mask)
 {
-        u32 val = _iwl_read32(priv, reg) & ~mask;
+        u32 val = _iwl4965_read32(priv, reg) & ~mask;
         IWL_DEBUG_IO("clear_bit(0x%08X, 0x%08X) = 0x%08X\n", reg, mask, val);
-        _iwl_write32(priv, reg, val);
+        _iwl4965_write32(priv, reg, val);
 }
-#define iwl_clear_bit(p, r, m) __iwl_clear_bit(__FILE__, __LINE__, p, r, m)
+#define iwl4965_clear_bit(p, r, m) __iwl4965_clear_bit(__FILE__, __LINE__, p, r, m)
 #else
-#define iwl_clear_bit(p, r, m) _iwl_clear_bit(p, r, m)
+#define iwl4965_clear_bit(p, r, m) _iwl4965_clear_bit(p, r, m)
 #endif
 
-static inline int _iwl_grab_nic_access(struct iwl_priv *priv)
+static inline int _iwl4965_grab_nic_access(struct iwl4965_priv *priv)
 {
         int ret;
         u32 gp_ctl;
@@ -170,7 +170,7 @@ static inline int _iwl_grab_nic_access(struct iwl_priv *priv)
                         "wakes up NIC\n");
 
                 /* 10 msec allows time for NIC to complete its data save */
-                gp_ctl = _iwl_read32(priv, CSR_GP_CNTRL);
+                gp_ctl = _iwl4965_read32(priv, CSR_GP_CNTRL);
                 if (gp_ctl & CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY) {
                         IWL_DEBUG_RF_KILL("Wait for complete power-down, "
                                 "gpctl = 0x%08x\n", gp_ctl);
@@ -181,8 +181,8 @@ static inline int _iwl_grab_nic_access(struct iwl_priv *priv)
         }
 
         /* this bit wakes up the NIC */
-        _iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-        ret = _iwl_poll_bit(priv, CSR_GP_CNTRL,
+        _iwl4965_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+        ret = _iwl4965_poll_bit(priv, CSR_GP_CNTRL,
                            CSR_GP_CNTRL_REG_VAL_MAC_ACCESS_EN,
                            (CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY |
                             CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP), 50);
@@ -198,106 +198,106 @@ static inline int _iwl_grab_nic_access(struct iwl_priv *priv)
 }
 
 #ifdef CONFIG_IWL4965_DEBUG
-static inline int __iwl_grab_nic_access(const char *f, u32 l,
-                                               struct iwl_priv *priv)
+static inline int __iwl4965_grab_nic_access(const char *f, u32 l,
+                                               struct iwl4965_priv *priv)
 {
         if (atomic_read(&priv->restrict_refcnt))
                 IWL_DEBUG_INFO("Grabbing access while already held at "
                                "line %d.\n", l);
 
         IWL_DEBUG_IO("grabbing nic access - %s %d\n", f, l);
-        return _iwl_grab_nic_access(priv);
+        return _iwl4965_grab_nic_access(priv);
 }
-#define iwl_grab_nic_access(priv) \
-        __iwl_grab_nic_access(__FILE__, __LINE__, priv)
+#define iwl4965_grab_nic_access(priv) \
+        __iwl4965_grab_nic_access(__FILE__, __LINE__, priv)
 #else
-#define iwl_grab_nic_access(priv) \
-        _iwl_grab_nic_access(priv)
+#define iwl4965_grab_nic_access(priv) \
+        _iwl4965_grab_nic_access(priv)
 #endif
 
-static inline void _iwl_release_nic_access(struct iwl_priv *priv)
+static inline void _iwl4965_release_nic_access(struct iwl4965_priv *priv)
 {
 #ifdef CONFIG_IWL4965_DEBUG
         if (atomic_dec_and_test(&priv->restrict_refcnt))
 #endif
-                _iwl_clear_bit(priv, CSR_GP_CNTRL,
+                _iwl4965_clear_bit(priv, CSR_GP_CNTRL,
                                CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
 }
 #ifdef CONFIG_IWL4965_DEBUG
-static inline void __iwl_release_nic_access(const char *f, u32 l,
-                                            struct iwl_priv *priv)
+static inline void __iwl4965_release_nic_access(const char *f, u32 l,
+                                            struct iwl4965_priv *priv)
 {
         if (atomic_read(&priv->restrict_refcnt) <= 0)
                 IWL_ERROR("Release unheld nic access at line %d.\n", l);
 
         IWL_DEBUG_IO("releasing nic access - %s %d\n", f, l);
-        _iwl_release_nic_access(priv);
+        _iwl4965_release_nic_access(priv);
 }
-#define iwl_release_nic_access(priv) \
-        __iwl_release_nic_access(__FILE__, __LINE__, priv)
+#define iwl4965_release_nic_access(priv) \
+        __iwl4965_release_nic_access(__FILE__, __LINE__, priv)
 #else
-#define iwl_release_nic_access(priv) \
-        _iwl_release_nic_access(priv)
+#define iwl4965_release_nic_access(priv) \
+        _iwl4965_release_nic_access(priv)
 #endif
 
-static inline u32 _iwl_read_direct32(struct iwl_priv *priv, u32 reg)
+static inline u32 _iwl4965_read_direct32(struct iwl4965_priv *priv, u32 reg)
 {
-        return _iwl_read32(priv, reg);
+        return _iwl4965_read32(priv, reg);
 }
 #ifdef CONFIG_IWL4965_DEBUG
-static inline u32 __iwl_read_direct32(const char *f, u32 l,
-                                        struct iwl_priv *priv, u32 reg)
+static inline u32 __iwl4965_read_direct32(const char *f, u32 l,
+                                        struct iwl4965_priv *priv, u32 reg)
 {
-        u32 value = _iwl_read_direct32(priv, reg);
+        u32 value = _iwl4965_read_direct32(priv, reg);
         if (!atomic_read(&priv->restrict_refcnt))
                 IWL_ERROR("Nic access not held from %s %d\n", f, l);
         IWL_DEBUG_IO("read_direct32(0x%4X) = 0x%08x - %s %d \n", reg, value,
                      f, l);
         return value;
 }
-#define iwl_read_direct32(priv, reg) \
-        __iwl_read_direct32(__FILE__, __LINE__, priv, reg)
+#define iwl4965_read_direct32(priv, reg) \
+        __iwl4965_read_direct32(__FILE__, __LINE__, priv, reg)
 #else
-#define iwl_read_direct32 _iwl_read_direct32
+#define iwl4965_read_direct32 _iwl4965_read_direct32
 #endif
 
-static inline void _iwl_write_direct32(struct iwl_priv *priv,
+static inline void _iwl4965_write_direct32(struct iwl4965_priv *priv,
                                          u32 reg, u32 value)
 {
-        _iwl_write32(priv, reg, value);
+        _iwl4965_write32(priv, reg, value);
 }
 #ifdef CONFIG_IWL4965_DEBUG
-static void __iwl_write_direct32(u32 line,
-                                   struct iwl_priv *priv, u32 reg, u32 value)
+static void __iwl4965_write_direct32(u32 line,
+                                   struct iwl4965_priv *priv, u32 reg, u32 value)
 {
         if (!atomic_read(&priv->restrict_refcnt))
                 IWL_ERROR("Nic access not held from line %d\n", line);
-        _iwl_write_direct32(priv, reg, value);
+        _iwl4965_write_direct32(priv, reg, value);
 }
-#define iwl_write_direct32(priv, reg, value) \
-        __iwl_write_direct32(__LINE__, priv, reg, value)
+#define iwl4965_write_direct32(priv, reg, value) \
+        __iwl4965_write_direct32(__LINE__, priv, reg, value)
 #else
-#define iwl_write_direct32 _iwl_write_direct32
+#define iwl4965_write_direct32 _iwl4965_write_direct32
 #endif
 
-static inline void iwl_write_reg_buf(struct iwl_priv *priv,
+static inline void iwl4965_write_reg_buf(struct iwl4965_priv *priv,
                                                u32 reg, u32 len, u32 *values)
 {
         u32 count = sizeof(u32);
 
         if ((priv != NULL) && (values != NULL)) {
                 for (; 0 < len; len -= count, reg += count, values++)
-                        _iwl_write_direct32(priv, reg, *values);
+                        _iwl4965_write_direct32(priv, reg, *values);
         }
 }
 
-static inline int _iwl_poll_direct_bit(struct iwl_priv *priv,
+static inline int _iwl4965_poll_direct_bit(struct iwl4965_priv *priv,
                                            u32 addr, u32 mask, int timeout)
 {
         int i = 0;
 
         do {
-                if ((_iwl_read_direct32(priv, addr) & mask) == mask)
+                if ((_iwl4965_read_direct32(priv, addr) & mask) == mask)
                         return i;
                 mdelay(10);
                 i += 10;
@@ -307,11 +307,11 @@ static inline int _iwl_poll_direct_bit(struct iwl_priv *priv,
 }
 
 #ifdef CONFIG_IWL4965_DEBUG
-static inline int __iwl_poll_direct_bit(const char *f, u32 l,
-                                            struct iwl_priv *priv,
+static inline int __iwl4965_poll_direct_bit(const char *f, u32 l,
+                                            struct iwl4965_priv *priv,
                                             u32 addr, u32 mask, int timeout)
 {
-        int ret  = _iwl_poll_direct_bit(priv, addr, mask, timeout);
+        int ret  = _iwl4965_poll_direct_bit(priv, addr, mask, timeout);
 
         if (unlikely(ret == -ETIMEDOUT))
                 IWL_DEBUG_IO("poll_direct_bit(0x%08X, 0x%08X) - "
@@ -321,111 +321,111 @@ static inline int __iwl_poll_direct_bit(const char *f, u32 l,
                              "- %s %d\n", addr, mask, ret, f, l);
         return ret;
 }
-#define iwl_poll_direct_bit(iwl, addr, mask, timeout) \
-        __iwl_poll_direct_bit(__FILE__, __LINE__, iwl, addr, mask, timeout)
+#define iwl4965_poll_direct_bit(iwl, addr, mask, timeout) \
+        __iwl4965_poll_direct_bit(__FILE__, __LINE__, iwl, addr, mask, timeout)
 #else
-#define iwl_poll_direct_bit _iwl_poll_direct_bit
+#define iwl4965_poll_direct_bit _iwl4965_poll_direct_bit
 #endif
 
-static inline u32 _iwl_read_prph(struct iwl_priv *priv, u32 reg)
+static inline u32 _iwl4965_read_prph(struct iwl4965_priv *priv, u32 reg)
 {
-        _iwl_write_direct32(priv, HBUS_TARG_PRPH_RADDR, reg | (3 << 24));
-        return _iwl_read_direct32(priv, HBUS_TARG_PRPH_RDAT);
+        _iwl4965_write_direct32(priv, HBUS_TARG_PRPH_RADDR, reg | (3 << 24));
+        return _iwl4965_read_direct32(priv, HBUS_TARG_PRPH_RDAT);
 }
 #ifdef CONFIG_IWL4965_DEBUG
-static inline u32 __iwl_read_prph(u32 line, struct iwl_priv *priv, u32 reg)
+static inline u32 __iwl4965_read_prph(u32 line, struct iwl4965_priv *priv, u32 reg)
 {
         if (!atomic_read(&priv->restrict_refcnt))
                 IWL_ERROR("Nic access not held from line %d\n", line);
-        return _iwl_read_prph(priv, reg);
+        return _iwl4965_read_prph(priv, reg);
 }
 
-#define iwl_read_prph(priv, reg) \
-        __iwl_read_prph(__LINE__, priv, reg)
+#define iwl4965_read_prph(priv, reg) \
+        __iwl4965_read_prph(__LINE__, priv, reg)
 #else
-#define iwl_read_prph _iwl_read_prph
+#define iwl4965_read_prph _iwl4965_read_prph
 #endif
 
-static inline void _iwl_write_prph(struct iwl_priv *priv,
+static inline void _iwl4965_write_prph(struct iwl4965_priv *priv,
                                              u32 addr, u32 val)
 {
-        _iwl_write_direct32(priv, HBUS_TARG_PRPH_WADDR,
+        _iwl4965_write_direct32(priv, HBUS_TARG_PRPH_WADDR,
                               ((addr & 0x0000FFFF) | (3 << 24)));
-        _iwl_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val);
+        _iwl4965_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val);
 }
 #ifdef CONFIG_IWL4965_DEBUG
-static inline void __iwl_write_prph(u32 line, struct iwl_priv *priv,
+static inline void __iwl4965_write_prph(u32 line, struct iwl4965_priv *priv,
                                               u32 addr, u32 val)
 {
         if (!atomic_read(&priv->restrict_refcnt))
                 IWL_ERROR("Nic access from line %d\n", line);
-        _iwl_write_prph(priv, addr, val);
+        _iwl4965_write_prph(priv, addr, val);
 }
 
-#define iwl_write_prph(priv, addr, val) \
-        __iwl_write_prph(__LINE__, priv, addr, val);
+#define iwl4965_write_prph(priv, addr, val) \
+        __iwl4965_write_prph(__LINE__, priv, addr, val);
 #else
-#define iwl_write_prph _iwl_write_prph
+#define iwl4965_write_prph _iwl4965_write_prph
 #endif
 
-#define _iwl_set_bits_prph(priv, reg, mask) \
-        _iwl_write_prph(priv, reg, (_iwl_read_prph(priv, reg) | mask))
+#define _iwl4965_set_bits_prph(priv, reg, mask) \
+        _iwl4965_write_prph(priv, reg, (_iwl4965_read_prph(priv, reg) | mask))
 #ifdef CONFIG_IWL4965_DEBUG
-static inline void __iwl_set_bits_prph(u32 line, struct iwl_priv *priv,
+static inline void __iwl4965_set_bits_prph(u32 line, struct iwl4965_priv *priv,
                                         u32 reg, u32 mask)
 {
         if (!atomic_read(&priv->restrict_refcnt))
                 IWL_ERROR("Nic access not held from line %d\n", line);
 
-        _iwl_set_bits_prph(priv, reg, mask);
+        _iwl4965_set_bits_prph(priv, reg, mask);
 }
-#define iwl_set_bits_prph(priv, reg, mask) \
-        __iwl_set_bits_prph(__LINE__, priv, reg, mask)
+#define iwl4965_set_bits_prph(priv, reg, mask) \
+        __iwl4965_set_bits_prph(__LINE__, priv, reg, mask)
 #else
-#define iwl_set_bits_prph _iwl_set_bits_prph
+#define iwl4965_set_bits_prph _iwl4965_set_bits_prph
 #endif
 
-#define _iwl_set_bits_mask_prph(priv, reg, bits, mask) \
-        _iwl_write_prph(priv, reg, ((_iwl_read_prph(priv, reg) & mask) | bits))
+#define _iwl4965_set_bits_mask_prph(priv, reg, bits, mask) \
+        _iwl4965_write_prph(priv, reg, ((_iwl4965_read_prph(priv, reg) & mask) | bits))
 
 #ifdef CONFIG_IWL4965_DEBUG
-static inline void __iwl_set_bits_mask_prph(u32 line,
-                struct iwl_priv *priv, u32 reg, u32 bits, u32 mask)
+static inline void __iwl4965_set_bits_mask_prph(u32 line,
+                struct iwl4965_priv *priv, u32 reg, u32 bits, u32 mask)
 {
         if (!atomic_read(&priv->restrict_refcnt))
                 IWL_ERROR("Nic access not held from line %d\n", line);
-        _iwl_set_bits_mask_prph(priv, reg, bits, mask);
+        _iwl4965_set_bits_mask_prph(priv, reg, bits, mask);
 }
-#define iwl_set_bits_mask_prph(priv, reg, bits, mask) \
-        __iwl_set_bits_mask_prph(__LINE__, priv, reg, bits, mask)
+#define iwl4965_set_bits_mask_prph(priv, reg, bits, mask) \
+        __iwl4965_set_bits_mask_prph(__LINE__, priv, reg, bits, mask)
 #else
-#define iwl_set_bits_mask_prph _iwl_set_bits_mask_prph
+#define iwl4965_set_bits_mask_prph _iwl4965_set_bits_mask_prph
 #endif
 
-static inline void iwl_clear_bits_prph(struct iwl_priv
+static inline void iwl4965_clear_bits_prph(struct iwl4965_priv
                                                  *priv, u32 reg, u32 mask)
 {
-        u32 val = _iwl_read_prph(priv, reg);
-        _iwl_write_prph(priv, reg, (val & ~mask));
+        u32 val = _iwl4965_read_prph(priv, reg);
+        _iwl4965_write_prph(priv, reg, (val & ~mask));
 }
 
-static inline u32 iwl_read_targ_mem(struct iwl_priv *priv, u32 addr)
+static inline u32 iwl4965_read_targ_mem(struct iwl4965_priv *priv, u32 addr)
 {
-        iwl_write_direct32(priv, HBUS_TARG_MEM_RADDR, addr);
-        return iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);
+        iwl4965_write_direct32(priv, HBUS_TARG_MEM_RADDR, addr);
+        return iwl4965_read_direct32(priv, HBUS_TARG_MEM_RDAT);
 }
 
-static inline void iwl_write_targ_mem(struct iwl_priv *priv, u32 addr, u32 val)
+static inline void iwl4965_write_targ_mem(struct iwl4965_priv *priv, u32 addr, u32 val)
 {
-        iwl_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);
-        iwl_write_direct32(priv, HBUS_TARG_MEM_WDAT, val);
+        iwl4965_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);
+        iwl4965_write_direct32(priv, HBUS_TARG_MEM_WDAT, val);
 }
 
-static inline void iwl_write_targ_mem_buf(struct iwl_priv *priv, u32 addr,
+static inline void iwl4965_write_targ_mem_buf(struct iwl4965_priv *priv, u32 addr,
                                           u32 len, u32 *values)
 {
-        iwl_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);
+        iwl4965_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);
         for (; 0 < len; len -= sizeof(u32), values++)
-                iwl_write_direct32(priv, HBUS_TARG_MEM_WDAT, *values);
+                iwl4965_write_direct32(priv, HBUS_TARG_MEM_WDAT, *values);
 }
 #endif