@@ -50,8 +50,8 @@
#define IICB0MDSC BIT(7) /* Bus Mode */
#define IICB0SLSE BIT(1) /* Start condition output */
-#define bit_setl(addr, val) writel(readl(addr) | (val), (addr))
-#define bit_clrl(addr, val) writel(readl(addr) & ~(val), (addr))
+#define BIT_SETL(addr, val) writel(readl(addr) | (val), (addr))
+#define BIT_CLRL(addr, val) writel(readl(addr) & ~(val), (addr))
struct rzv2m_i2c_priv {
void __iomem *base;
@@ -198,7 +198,7 @@ static int rzv2m_i2c_read_with_ack(struct rzv2m_i2c_priv *priv, u8 *data,
reinit_completion(&priv->msg_tia_done);
/* Interrupt request timing : 8th clock */
- bit_clrl(priv->base + IICB0CTL0, IICB0SLWT);
+ BIT_CLRL(priv->base + IICB0CTL0, IICB0SLWT);
/* Exit the wait state */
writel(IICB0WRET, priv->base + IICB0TRG);
@@ -211,13 +211,13 @@ static int rzv2m_i2c_read_with_ack(struct rzv2m_i2c_priv *priv, u8 *data,
if (last) {
/* Disable ACK */
- bit_clrl(priv->base + IICB0CTL0, IICB0SLAC);
+ BIT_CLRL(priv->base + IICB0CTL0, IICB0SLAC);
/* Read data*/
data_tmp = readl(priv->base + IICB0DAT);
/* Interrupt request timing : 9th clock */
- bit_setl(priv->base + IICB0CTL0, IICB0SLWT);
+ BIT_SETL(priv->base + IICB0CTL0, IICB0SLWT);
/* Exit the wait state */
writel(IICB0WRET, priv->base + IICB0TRG);
@@ -229,7 +229,7 @@ static int rzv2m_i2c_read_with_ack(struct rzv2m_i2c_priv *priv, u8 *data,
return -ETIMEDOUT;
/* Enable ACK */
- bit_setl(priv->base + IICB0CTL0, IICB0SLAC);
+ BIT_SETL(priv->base + IICB0CTL0, IICB0SLAC);
} else {
/* Read data */
data_tmp = readl(priv->base + IICB0DAT);
@@ -466,7 +466,7 @@ static int rzv2m_i2c_remove(struct platform_device *pdev)
struct device *dev = priv->adap.dev.parent;
i2c_del_adapter(&priv->adap);
- bit_clrl(priv->base + IICB0CTL0, IICB0IICE);
+ BIT_CLRL(priv->base + IICB0CTL0, IICB0IICE);
pm_runtime_disable(dev);
return 0;
@@ -481,7 +481,7 @@ static int rzv2m_i2c_suspend(struct device *dev)
if (ret < 0)
return ret;
- bit_clrl(priv->base + IICB0CTL0, IICB0IICE);
+ BIT_CLRL(priv->base + IICB0CTL0, IICB0IICE);
pm_runtime_put(dev);
return 0;
Normally we'd put macro names in all uppercase. Rename bit_setl->BIT_SETL and bit_clrl->BIT_CLRL. Reported-by: Pavel Machek <pavel@denx.de> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> --- drivers/i2c/busses/i2c-rzv2m.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)