| Message ID | 20200716215431.GA19300@embeddedor |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [next] i2c: mv64xxx: Use fallthrough pseudo-keyword | expand |
"Gustavo A. R. Silva" <gustavoars@kernel.org> writes: > Replace the existing /* fall through */ comments and its variants with > the new pseudo-keyword macro fallthrough[1]. > > [1] https://www.kernel.org/doc/html/latest/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through > > Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> Reviewed-by: Gregory CLEMENT <gregory.clement@bootlin.com> > --- > drivers/i2c/busses/i2c-mv64xxx.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c > index 829b8c98ae51..8d9d4ffdcd24 100644 > --- a/drivers/i2c/busses/i2c-mv64xxx.c > +++ b/drivers/i2c/busses/i2c-mv64xxx.c > @@ -251,7 +251,7 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status) > MV64XXX_I2C_STATE_WAITING_FOR_ADDR_2_ACK; > break; > } > - /* FALLTHRU */ > + fallthrough; > case MV64XXX_I2C_STATUS_MAST_WR_ADDR_2_ACK: /* 0xd0 */ > case MV64XXX_I2C_STATUS_MAST_WR_ACK: /* 0x28 */ > if ((drv_data->bytes_left == 0) > @@ -282,14 +282,14 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status) > MV64XXX_I2C_STATE_WAITING_FOR_ADDR_2_ACK; > break; > } > - /* FALLTHRU */ > + fallthrough; > case MV64XXX_I2C_STATUS_MAST_RD_ADDR_2_ACK: /* 0xe0 */ > if (drv_data->bytes_left == 0) { > drv_data->action = MV64XXX_I2C_ACTION_SEND_STOP; > drv_data->state = MV64XXX_I2C_STATE_IDLE; > break; > } > - /* FALLTHRU */ > + fallthrough; > case MV64XXX_I2C_STATUS_MAST_RD_DATA_ACK: /* 0x50 */ > if (status != MV64XXX_I2C_STATUS_MAST_RD_DATA_ACK) > drv_data->action = MV64XXX_I2C_ACTION_CONTINUE; > @@ -417,8 +417,7 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data) > "mv64xxx_i2c_do_action: Invalid action: %d\n", > drv_data->action); > drv_data->rc = -EIO; > - > - /* FALLTHRU */ > + fallthrough; > case MV64XXX_I2C_ACTION_SEND_STOP: > drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_INTEN; > writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_STOP, > -- > 2.27.0 >
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index 829b8c98ae51..8d9d4ffdcd24 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c @@ -251,7 +251,7 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status) MV64XXX_I2C_STATE_WAITING_FOR_ADDR_2_ACK; break; } - /* FALLTHRU */ + fallthrough; case MV64XXX_I2C_STATUS_MAST_WR_ADDR_2_ACK: /* 0xd0 */ case MV64XXX_I2C_STATUS_MAST_WR_ACK: /* 0x28 */ if ((drv_data->bytes_left == 0) @@ -282,14 +282,14 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status) MV64XXX_I2C_STATE_WAITING_FOR_ADDR_2_ACK; break; } - /* FALLTHRU */ + fallthrough; case MV64XXX_I2C_STATUS_MAST_RD_ADDR_2_ACK: /* 0xe0 */ if (drv_data->bytes_left == 0) { drv_data->action = MV64XXX_I2C_ACTION_SEND_STOP; drv_data->state = MV64XXX_I2C_STATE_IDLE; break; } - /* FALLTHRU */ + fallthrough; case MV64XXX_I2C_STATUS_MAST_RD_DATA_ACK: /* 0x50 */ if (status != MV64XXX_I2C_STATUS_MAST_RD_DATA_ACK) drv_data->action = MV64XXX_I2C_ACTION_CONTINUE; @@ -417,8 +417,7 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data) "mv64xxx_i2c_do_action: Invalid action: %d\n", drv_data->action); drv_data->rc = -EIO; - - /* FALLTHRU */ + fallthrough; case MV64XXX_I2C_ACTION_SEND_STOP: drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_INTEN; writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_STOP,
Replace the existing /* fall through */ comments and its variants with the new pseudo-keyword macro fallthrough[1]. [1] https://www.kernel.org/doc/html/latest/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> --- drivers/i2c/busses/i2c-mv64xxx.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)