[PATCH] i2c: mt65xx: Avoid double initialization of restart_flag in isr

AngeloGioacchino Del Regno posted 1 patch 1 month, 2 weeks ago
drivers/i2c/busses/i2c-mt65xx.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
[PATCH] i2c: mt65xx: Avoid double initialization of restart_flag in isr
Posted by AngeloGioacchino Del Regno 1 month, 2 weeks ago
In the mtk_i2c_irq() handler, variable restart_flag is initialized
to zero and then reassigned with I2C_RS_TRANSFER if and only if
auto_restart is enabled.

Avoid a double initialization of this variable by transferring the
auto_restart check to the restart_flag declaration.

This commit brings no functional changes.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
---
 drivers/i2c/busses/i2c-mt65xx.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/i2c/busses/i2c-mt65xx.c b/drivers/i2c/busses/i2c-mt65xx.c
index a8b5719c3372..e0ba653dec2d 100644
--- a/drivers/i2c/busses/i2c-mt65xx.c
+++ b/drivers/i2c/busses/i2c-mt65xx.c
@@ -1306,12 +1306,9 @@ static int mtk_i2c_transfer(struct i2c_adapter *adap,
 static irqreturn_t mtk_i2c_irq(int irqno, void *dev_id)
 {
 	struct mtk_i2c *i2c = dev_id;
-	u16 restart_flag = 0;
+	u16 restart_flag = i2c->auto_restart ? I2C_RS_TRANSFER : 0;
 	u16 intr_stat;
 
-	if (i2c->auto_restart)
-		restart_flag = I2C_RS_TRANSFER;
-
 	intr_stat = mtk_i2c_readw(i2c, OFFSET_INTR_STAT);
 	mtk_i2c_writew(i2c, intr_stat, OFFSET_INTR_STAT);
 
-- 
2.45.2
Re: [PATCH] i2c: mt65xx: Avoid double initialization of restart_flag in isr
Posted by Andi Shyti 1 month, 1 week ago
Hi Angelo,

On Tue, Aug 06, 2024 at 11:45:37AM GMT, AngeloGioacchino Del Regno wrote:
> In the mtk_i2c_irq() handler, variable restart_flag is initialized
> to zero and then reassigned with I2C_RS_TRANSFER if and only if
> auto_restart is enabled.
> 
> Avoid a double initialization of this variable by transferring the
> auto_restart check to the restart_flag declaration.
> 
> This commit brings no functional changes.
> 
> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

merged to i2c/i2c-host.

Thanks,
Andi