diff mbox series

[2/3] i2c: rzv2m: Rename macro names in all uppercase

Message ID 20230525135108.240651-3-biju.das.jz@bp.renesas.com
State Superseded
Headers show
Series [1/3] i2c: rzv2m: Drop extra space | expand

Commit Message

Biju Das May 25, 2023, 1:51 p.m. UTC
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(-)

Comments

Geert Uytterhoeven May 25, 2023, 4:06 p.m. UTC | #1
Hi Biju,

On Thu, May 25, 2023 at 3:51 PM Biju Das <biju.das.jz@bp.renesas.com> wrote:
> 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>

Thanks for your patch!

> --- a/drivers/i2c/busses/i2c-rzv2m.c
> +++ b/drivers/i2c/busses/i2c-rzv2m.c
> @@ -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))

I'd rather change them to static inline functions instead.

Gr{oetje,eeting}s,

                        Geert
Biju Das May 25, 2023, 4:10 p.m. UTC | #2
Hi Geert,

Thanks for the feedback.

> -----Original Message-----
> From: Geert Uytterhoeven <geert@linux-m68k.org>
> Sent: Thursday, May 25, 2023 5:07 PM
> To: Biju Das <biju.das.jz@bp.renesas.com>
> Cc: Wolfram Sang <wsa@kernel.org>; Andy Shevchenko
> <andriy.shevchenko@linux.intel.com>; Philipp Zabel
> <p.zabel@pengutronix.de>; linux-i2c@vger.kernel.org; Geert Uytterhoeven
> <geert+renesas@glider.be>; Prabhakar Mahadev Lad <prabhakar.mahadev-
> lad.rj@bp.renesas.com>; linux-renesas-soc@vger.kernel.org; Pavel Machek
> <pavel@denx.de>
> Subject: Re: [PATCH 2/3] i2c: rzv2m: Rename macro names in all uppercase
> 
> Hi Biju,
> 
> On Thu, May 25, 2023 at 3:51 PM Biju Das <biju.das.jz@bp.renesas.com>
> wrote:
> > 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>
> 
> Thanks for your patch!
> 
> > --- a/drivers/i2c/busses/i2c-rzv2m.c
> > +++ b/drivers/i2c/busses/i2c-rzv2m.c
> > @@ -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))
> 
> I'd rather change them to static inline functions instead.

OK, will change it to static inline fns.

Cheers,
Biju
diff mbox series

Patch

diff --git a/drivers/i2c/busses/i2c-rzv2m.c b/drivers/i2c/busses/i2c-rzv2m.c
index 56d0faee5c46..ccd337f2e8c3 100644
--- a/drivers/i2c/busses/i2c-rzv2m.c
+++ b/drivers/i2c/busses/i2c-rzv2m.c
@@ -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;