#define SF2_IO_MACRO(name) \
 static inline u32 name##_readl(struct bcm_sf2_priv *priv, u32 off)     \
 {                                                                      \
-       return __raw_readl(priv->name + off);                           \
+       return readl_relaxed(priv->name + off);                         \
 }                                                                      \
 static inline void name##_writel(struct bcm_sf2_priv *priv,            \
                                  u32 val, u32 off)                     \
 {                                                                      \
-       __raw_writel(val, priv->name + off);                            \
+       writel_relaxed(val, priv->name + off);                          \
 }                                                                      \
 
 /* Accesses to 64-bits register requires us to latch the hi/lo pairs
 static inline u32 core_readl(struct bcm_sf2_priv *priv, u32 off)
 {
        u32 tmp = bcm_sf2_mangle_addr(priv, off);
-       return __raw_readl(priv->core + tmp);
+       return readl_relaxed(priv->core + tmp);
 }
 
 static inline void core_writel(struct bcm_sf2_priv *priv, u32 val, u32 off)
 {
        u32 tmp = bcm_sf2_mangle_addr(priv, off);
-       __raw_writel(val, priv->core + tmp);
+       writel_relaxed(val, priv->core + tmp);
 }
 
 static inline u32 reg_readl(struct bcm_sf2_priv *priv, u16 off)
 {
-       return __raw_readl(priv->reg + priv->reg_offsets[off]);
+       return readl_relaxed(priv->reg + priv->reg_offsets[off]);
 }
 
 static inline void reg_writel(struct bcm_sf2_priv *priv, u32 val, u16 off)
 {
-       __raw_writel(val, priv->reg + priv->reg_offsets[off]);
+       writel_relaxed(val, priv->reg + priv->reg_offsets[off]);
 }
 
 SF2_IO64_MACRO(core);