i2c: tegra-bpmp: cleanups
Subsystems (2)
cover i2c: tegra-bpmp: cleanups
While reviewing a patch for this driver, I noticed that we can remove quite some lines here. Not tested on HW, because I don't have it. Builds fine, though. I'd appreciate tests / reviews. Thanks!
Wolfram Sang (2):
i2c: tegra-bpmp: don't modify input variable in xlate_flags
i2c: tegra-bpmp: make some functions void
drivers/i2c/busses/i2c-tegra-bpmp.c | 52 +++++++---------------------- 1 file changed, 12 insertions(+), 40 deletions(-)
Signature · 1 line
2.30.0
PATCH 1/2 i2c: tegra-bpmp: don't modify input variable in xlate_flags
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.
--- drivers/i2c/busses/i2c-tegra-bpmp.c | 32 ++++++++--------------------- 1 file changed, 8 insertions(+), 24 deletions(-)
drivers/i2c/busses/i2c-tegra-bpmp.c +8 -24
@@ -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 ; }
Signature · 1 line
2.30.0
Re: [PATCH RFT 1/2] i2c: tegra-bpmp: don't modify input variable in xlate_flags
Quoted 8 lines · Wolfram Sang
Since commit
bc1c2048abbe("i2c: bpmp-tegra: Ignore unknownI2C_Mflags") 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 <[email protected]>--- drivers/i2c/busses/i2c-tegra-bpmp.c | 32 ++++++++--------------------- 1 file changed, 8 insertions(+), 24 deletions(-)
Heh... good catch!
Re: [PATCH RFT 1/2] i2c: tegra-bpmp: don't modify input variable in xlate_flags
In reply to Wolfram SangQuoted 8 lines · Wolfram Sang
Since commit
bc1c2048abbe("i2c: bpmp-tegra: Ignore unknownI2C_Mflags") 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 <[email protected]>--- 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:
Wolfram Sang
AppliedRe: [PATCH RFT 1/2] i2c: tegra-bpmp: don't modify input variable in xlate_flags
In reply to Wolfram SangQuoted 5 lines · Wolfram Sang
Since commit
bc1c2048abbe("i2c: bpmp-tegra: Ignore unknownI2C_Mflags") 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 <[email protected]>
Applied to for-next, thanks!
PATCH 2/2 i2c: tegra-bpmp: make some functions void
In reply to Wolfram SangThey return 0 always, so save some lines and code.
--- drivers/i2c/busses/i2c-tegra-bpmp.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-)
drivers/i2c/busses/i2c-tegra-bpmp.c +4 -16
@@ -38,7 +38,7 @@ struct tegra_bpmp_i2c {* firmware I2C driver to avoid any issues in future if Linux I2C flags are * changed. */ -static int tegra_bpmp_xlate_flags (u16 flags,u16 *out) +static void tegra_bpmp_xlate_flags (u16 flags,u16 *out) {if (flags &I2C_M_TEN ) *out |=SERIALI2C_TEN ;
@@ -63,8 +63,6 @@ static int tegra_bpmp_xlate_flags(u16 flags, u16 *out)if (flags &I2C_M_RECV_LEN ) *out |=SERIALI2C_RECV_LEN ; - -return 0 ; }/**
@@ -81,22 +79,19 @@ static int tegra_bpmp_xlate_flags(u16 flags, u16 *out)* * See deserialize_i2c documentation for the data format in the other direction. */ -static int tegra_bpmp_serialize_i2c_msg (struct tegra_bpmp_i2c *i2c, +static void tegra_bpmp_serialize_i2c_msg (struct tegra_bpmp_i2c *i2c,struct mrq_i2c_request *request,struct i2c_msg *msgs,unsigned int num) {char *buf = request->xfer.data_buf;unsigned int i, j, pos =0 ; -int err;for (i =0 ; i < num; i++) {struct i2c_msg *msg = &msgs[i];u16 flags =0 ; - err =tegra_bpmp_xlate_flags (msg->flags, &flags); -if (err <0 ) -return err; +tegra_bpmp_xlate_flags (msg->flags, &flags); buf[pos++] = msg->addr &0xff ; buf[pos++] = (msg->addr &0xff00 ) >>8 ;
@@ -112,8 +107,6 @@ static int tegra_bpmp_serialize_i2c_msg(struct tegra_bpmp_i2c *i2c, } request->xfer.data_size = pos; - -return 0 ; }/**
@@ -247,12 +240,7 @@ static int tegra_bpmp_i2c_xfer_common(struct i2c_adapter *adapter,memset (&request,0 ,sizeof (request));memset (&response,0 ,sizeof (response)); - err =tegra_bpmp_serialize_i2c_msg (i2c, &request, msgs, num); -if (err <0 ) { -dev_err (i2c->dev,"failed to serialize message: %d\n" , err); -return err; - } - +tegra_bpmp_serialize_i2c_msg (i2c, &request, msgs, num); err =tegra_bpmp_i2c_msg_xfer (i2c, &request, &response, atomic);if (err <0 ) {dev_err (i2c->dev,"failed to transfer message: %d\n" , err);
Signature · 1 line
2.30.0
Re: [PATCH RFT 2/2] i2c: tegra-bpmp: make some functions void
Quoted 6 lines · Wolfram Sang
They return 0 always, so save some lines and code.
Signed-off-by Wolfram Sang <[email protected]>--- drivers/i2c/busses/i2c-tegra-bpmp.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-)
Re: [PATCH RFT 2/2] i2c: tegra-bpmp: make some functions void
In reply to Wolfram SangQuoted 6 lines · Wolfram Sang
They return 0 always, so save some lines and code.
Signed-off-by Wolfram Sang <[email protected]>--- drivers/i2c/busses/i2c-tegra-bpmp.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-)
Wolfram Sang
AppliedRe: [PATCH RFT 2/2] i2c: tegra-bpmp: make some functions void
In reply to Wolfram SangQuoted 3 lines · Wolfram Sang
They return 0 always, so save some lines and code.
Signed-off-by Wolfram Sang <[email protected]>
Applied to for-next, thanks!