Improve usage of 'ret' variable and make pcf_doAdress() void
cover Improve usage of 'ret' variable and make pcf_doAdress() void
Hello maintainers,
This patch series is a response to Change Requests made by Andi Shyti on [PATCH v7 0/3] i2c: pcf8584: Fix errors and warnings reported by checkpatch and more specific on PATCH: i2c: pcf8584: Move 'ret' variable inside for loop, break if ret < 0.
Also a comment from Andy Shevchenko about using goto instead of break since the goto was used in other error path branches so it makes sense to be consistent.
Patches are dependent on each other that's why the need for a new patch series.
Change Requests:
-remove initialization of 'ret' variable inside for loop of pcf_xfer() as it is not needed
-change pcf_doAddress() function type from int to void as it always returns 0.
Testing:
*built kernel and modules with I2C_ALGOPCF=m and my 2 patches applied on top of 6.18.0-rc1.
*installed kernel and external modules generated by build on my laptop *rebooted and loaded i2c-algo-pcf.ko without i2c_debug parameter. *when loading the .ko with i2c_debug parameter an error is seen in dmesg and this is expected as the parameter was removed.
*No success message related to i2c_algo_pcf was seen in dmesg but also no failures.
*Module loading and unloading successful.
*No PCF8584 Hardware was available
Cezar Chiru (2):
i2c: pcf8584: Move 'ret' variable inside for loop, goto out if ret <
0.
i2c: pcf8584: Make pcf_doAddress() function void
drivers/i2c/algos/i2c-algo-pcf.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
--
2.43.0
PATCH 1/2 i2c: pcf8584: Move 'ret' variable inside for loop, goto out if ret < 0.
Require spaces around '=' and '<'. Add spaces around binary operators. Enforce error fixing based on checkpatch.pl output on file. Move 'ret' variable inside for loop. Then check if (ret < 0) goto out. This improves usage of ret variable.
--- drivers/i2c/algos/i2c-algo-pcf.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/i2c/algos/i2c-algo-pcf.c +8 -4
@@ -183,7 +183,7 @@ static int pcf_sendbytes(struct i2c_adapter *i2c_adap, const char *buf,struct i2c_algo_pcf_data *adap = i2c_adap->algo_data;int wrcount, status, timeout; -for (wrcount=0 ; wrcount<count; ++wrcount) { +for (wrcount =0 ; wrcount < count; ++wrcount) {i2c_outb (adap, buf[wrcount]); timeout =wait_for_pin (adap, &status);if (timeout) {
@@ -272,7 +272,7 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap,struct i2c_algo_pcf_data *adap = i2c_adap->algo_data;struct i2c_msg *pmsg;int i; -int ret=0 , timeout, status; +int timeout, status;if (adap->xfer_begin) adap->xfer_begin (adap->data);
@@ -284,9 +284,10 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap, goto out; } -for (i =0 ;ret >=0 && i < num; i++) { - pmsg = &msgs[i]; +for (i =0 ; i < num; i++) { +int ret; + pmsg = &msgs[i]; ret =pcf_doAddress (adap, pmsg);/* Send START */
@@ -321,6 +322,9 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap, ret =pcf_sendbytes (i2c_adap, pmsg->buf, pmsg->len, (i +1 == num)); } + +if (ret <0 ) + goto out; } out:
Signature · 1 line
2.43.0
PATCH 2/2 i2c: pcf8584: Make pcf_doAddress() function void
In reply to Cezar ChiruChange pcf_doAddress() function's type from int to void as it is always returns 0. This way there is no need for extra assignment and extra checks when the function is called.
Remove assignment of pcf_doAddress() and replace it with a simple function call.
--- drivers/i2c/algos/i2c-algo-pcf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/i2c/algos/i2c-algo-pcf.c +2 -4
@@ -253,7 +253,7 @@ static int pcf_readbytes(struct i2c_adapter *i2c_adap, char *buf, } -static int pcf_doAddress (struct i2c_algo_pcf_data *adap, +static void pcf_doAddress (struct i2c_algo_pcf_data *adap,struct i2c_msg *msg) {unsigned char addr =i2c_8bit_addr_from_msg (msg);
@@ -261,8 +261,6 @@ static int pcf_doAddress(struct i2c_algo_pcf_data *adap,if (msg->flags &I2C_M_REV_DIR_ADDR ) addr ^=1 ;i2c_outb (adap, addr); - -return 0 ; } static int pcf_xfer(struct i2c_adapter *i2c_adap,
@@ -288,7 +286,7 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap,int ret; pmsg = &msgs[i]; - ret =pcf_doAddress (adap, pmsg); +pcf_doAddress (adap, pmsg);/* Send START */ if (i ==0 )
--
2.43.0