| Message ID | 20210331075141.22227-2-wsa@kernel.org |
|---|---|
| State | Accepted |
| Commit | 22e06b30f94c9b014dfba029d84395542e274885 |
| Headers | show |
| Series | [RFT,1/2] i2c: tegra-bpmp: don't modify input variable in xlate_flags | expand |
On Wed, Mar 31, 2021 at 09:51:40AM +0200, Wolfram Sang wrote: > Since commit bc1c2048abbe ("i2c: bpmp-tegra: Ignore unknown I2C_M > flags") we don't need to mask out flags and can keep the input variable > as is to save quite some lines. > > Signed-off-by: Wolfram Sang <wsa@kernel.org> > --- > drivers/i2c/busses/i2c-tegra-bpmp.c | 32 ++++++++--------------------- > 1 file changed, 8 insertions(+), 24 deletions(-) Heh... good catch! Acked-by: Thierry Reding <treding@nvidia.com>
On Wed, Mar 31, 2021 at 09:51:40AM +0200, Wolfram Sang wrote: > Since commit bc1c2048abbe ("i2c: bpmp-tegra: Ignore unknown I2C_M > flags") we don't need to mask out flags and can keep the input variable > as is to save quite some lines. > > Signed-off-by: Wolfram Sang <wsa@kernel.org> > --- > drivers/i2c/busses/i2c-tegra-bpmp.c | 32 ++++++++--------------------- > 1 file changed, 8 insertions(+), 24 deletions(-) I've applied this to my local development tree and ran this on Tegra194, didn't see any issues, so: Tested-by: Thierry Reding <treding@nvidia.com>
On Wed, Mar 31, 2021 at 09:51:40AM +0200, Wolfram Sang wrote: > Since commit bc1c2048abbe ("i2c: bpmp-tegra: Ignore unknown I2C_M > flags") we don't need to mask out flags and can keep the input variable > as is to save quite some lines. > > Signed-off-by: Wolfram Sang <wsa@kernel.org> Applied to for-next, thanks!
diff --git a/drivers/i2c/busses/i2c-tegra-bpmp.c b/drivers/i2c/busses/i2c-tegra-bpmp.c index c934d636f625..295286ad6d6c 100644 --- a/drivers/i2c/busses/i2c-tegra-bpmp.c +++ b/drivers/i2c/busses/i2c-tegra-bpmp.c @@ -40,45 +40,29 @@ struct tegra_bpmp_i2c { */ static int tegra_bpmp_xlate_flags(u16 flags, u16 *out) { - if (flags & I2C_M_TEN) { + if (flags & I2C_M_TEN) *out |= SERIALI2C_TEN; - flags &= ~I2C_M_TEN; - } - if (flags & I2C_M_RD) { + if (flags & I2C_M_RD) *out |= SERIALI2C_RD; - flags &= ~I2C_M_RD; - } - if (flags & I2C_M_STOP) { + if (flags & I2C_M_STOP) *out |= SERIALI2C_STOP; - flags &= ~I2C_M_STOP; - } - if (flags & I2C_M_NOSTART) { + if (flags & I2C_M_NOSTART) *out |= SERIALI2C_NOSTART; - flags &= ~I2C_M_NOSTART; - } - if (flags & I2C_M_REV_DIR_ADDR) { + if (flags & I2C_M_REV_DIR_ADDR) *out |= SERIALI2C_REV_DIR_ADDR; - flags &= ~I2C_M_REV_DIR_ADDR; - } - if (flags & I2C_M_IGNORE_NAK) { + if (flags & I2C_M_IGNORE_NAK) *out |= SERIALI2C_IGNORE_NAK; - flags &= ~I2C_M_IGNORE_NAK; - } - if (flags & I2C_M_NO_RD_ACK) { + if (flags & I2C_M_NO_RD_ACK) *out |= SERIALI2C_NO_RD_ACK; - flags &= ~I2C_M_NO_RD_ACK; - } - if (flags & I2C_M_RECV_LEN) { + if (flags & I2C_M_RECV_LEN) *out |= SERIALI2C_RECV_LEN; - flags &= ~I2C_M_RECV_LEN; - } return 0; }
Since commit bc1c2048abbe ("i2c: bpmp-tegra: Ignore unknown I2C_M flags") we don't need to mask out flags and can keep the input variable as is to save quite some lines. Signed-off-by: Wolfram Sang <wsa@kernel.org> --- drivers/i2c/busses/i2c-tegra-bpmp.c | 32 ++++++++--------------------- 1 file changed, 8 insertions(+), 24 deletions(-)