Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5efde3b authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: replace readl and writel with io/read/write/32 



This patch replaces readl and writel with more cross platform ioread32
and iowrite32.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9257746f

drivers/net/wireless/iwlwifi/iwl-3945-io.h

+3 −3
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
 *

 */



#define _iwl3945_write32(priv, ofs, val) writel((val), (priv)->hw_base + (ofs))

#define _iwl3945_write32(priv, ofs, val) iowrite32((val), (priv)->hw_base + (ofs))

#ifdef CONFIG_IWL3945_DEBUG

static inline void __iwl3945_write32(const char *f, u32 l, struct iwl3945_priv *priv,

				 u32 ofs, u32 val)
@@ -73,7 +73,7 @@ static inline void __iwl3945_write32(const char *f, u32 l, struct iwl3945_priv * 
#define iwl3945_write32(priv, ofs, val) _iwl3945_write32(priv, ofs, val)

#endif



#define _iwl3945_read32(priv, ofs) readl((priv)->hw_base + (ofs))

#define _iwl3945_read32(priv, ofs) ioread32((priv)->hw_base + (ofs))

#ifdef CONFIG_IWL3945_DEBUG

static inline u32 __iwl3945_read32(char *f, u32 l, struct iwl3945_priv *priv, u32 ofs)

{

drivers/net/wireless/iwlwifi/iwl-io.h

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
 *

 */



#define _iwl_write32(priv, ofs, val) writel((val), (priv)->hw_base + (ofs))

#define _iwl_write32(priv, ofs, val) iowrite32((val), (priv)->hw_base + (ofs))

#ifdef CONFIG_IWLWIFI_DEBUG

static inline void __iwl_write32(const char *f, u32 l, struct iwl_priv *priv,

				 u32 ofs, u32 val)
@@ -75,7 +75,7 @@ static inline void __iwl_write32(const char *f, u32 l, struct iwl_priv *priv, 
#define iwl_write32(priv, ofs, val) _iwl_write32(priv, ofs, val)

#endif



#define _iwl_read32(priv, ofs) readl((priv)->hw_base + (ofs))

#define _iwl_read32(priv, ofs) ioread32((priv)->hw_base + (ofs))

#ifdef CONFIG_IWLWIFI_DEBUG

static inline u32 __iwl_read32(char *f, u32 l, struct iwl_priv *priv, u32 ofs)

{