Re: [PATCH 06/21] i2c: diolan: make use of i2c_8bit_addr_from_msg

[Guenter Roeck]

On Mon, May 14, 2018 at 04:53:15PM +0200, Peter Rosin wrote:
> Because it looks neater and allows factoring out some code
> that is now common between if and else.
> 
> Signed-off-by: Peter Rosin <peda@xxxxxxxxxx>

Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>

> ---
>  drivers/i2c/busses/i2c-diolan-u2c.c | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
> index f718ee4e3332..3f28317cde39 100644
> --- a/drivers/i2c/busses/i2c-diolan-u2c.c
> +++ b/drivers/i2c/busses/i2c-diolan-u2c.c
> @@ -360,11 +360,11 @@ static int diolan_usb_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs,
>  			if (ret < 0)
>  				goto abort;
>  		}
> +		ret = diolan_i2c_put_byte_ack(dev,
> +					      i2c_8bit_addr_from_msg(pmsg));
> +		if (ret < 0)
> +			goto abort;
>  		if (pmsg->flags & I2C_M_RD) {
> -			ret =
> -			    diolan_i2c_put_byte_ack(dev, (pmsg->addr << 1) | 1);
> -			if (ret < 0)
> -				goto abort;
>  			for (j = 0; j < pmsg->len; j++) {
>  				u8 byte;
>  				bool ack = j < pmsg->len - 1;
> @@ -393,9 +393,6 @@ static int diolan_usb_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs,
>  				pmsg->buf[j] = byte;
>  			}
>  		} else {
> -			ret = diolan_i2c_put_byte_ack(dev, pmsg->addr << 1);
> -			if (ret < 0)
> -				goto abort;
>  			for (j = 0; j < pmsg->len; j++) {
>  				ret = diolan_i2c_put_byte_ack(dev,
>  							      pmsg->buf[j]);
> -- 
> 2.11.0
>