From: Florian Fainelli Date: Fri, 20 Jan 2017 20:36:28 +0000 (-0800) Subject: net: dsa: bcm_sf2: Make SF2_IO64_MACRO() utilize 32-bit macro X-Git-Tag: MMI-PSA29.97-13-9~6152^2~352^2~6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=329b5c58f8b2833f330d64d5a2a1517a0c1e070e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git net: dsa: bcm_sf2: Make SF2_IO64_MACRO() utilize 32-bit macro There is no point inlining the 32-bit direct register read/write part, just infer it from the existing macro. This will make it easier to centralize the address rewriting that we are going to introduce later on. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller --- diff --git a/drivers/net/dsa/bcm_sf2.h b/drivers/net/dsa/bcm_sf2.h index 44692673e1d5..4531c2333e86 100644 --- a/drivers/net/dsa/bcm_sf2.h +++ b/drivers/net/dsa/bcm_sf2.h @@ -125,7 +125,7 @@ static inline u64 name##_readq(struct bcm_sf2_priv *priv, u32 off) \ { \ u32 indir, dir; \ spin_lock(&priv->indir_lock); \ - dir = __raw_readl(priv->name + off); \ + dir = name##_readl(priv, off); \ indir = reg_readl(priv, REG_DIR_DATA_READ); \ spin_unlock(&priv->indir_lock); \ return (u64)indir << 32 | dir; \ @@ -135,7 +135,7 @@ static inline void name##_writeq(struct bcm_sf2_priv *priv, u64 val, \ { \ spin_lock(&priv->indir_lock); \ reg_writel(priv, upper_32_bits(val), REG_DIR_DATA_WRITE); \ - __raw_writel(lower_32_bits(val), priv->name + off); \ + name##_writel(priv, lower_32_bits(val), off); \ spin_unlock(&priv->indir_lock); \ }