[U-Boot] [PATCH 5/6] i2c: rcar_i2c: Set the slave address from rcar_i2c_xfer

[Marek Vasut]

On 3/5/19 11:46 AM, Ismael Luceno Cortes wrote:
> On 04/Mar/2019 20:46, Marek Vasut wrote:
>> On 3/4/19 3:19 PM, Ismael Luceno Cortes wrote:
>>> Signed-off-by: Ismael Luceno <ismael.luceno at silicon-gears.com>
>>> ---
>>>  drivers/i2c/rcar_i2c.c | 14 +++++---------
>>>  1 file changed, 5 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c
>>> index b4cc0c55b1..5e04b68d95 100644
>>> --- a/drivers/i2c/rcar_i2c.c
>>> +++ b/drivers/i2c/rcar_i2c.c
>>> @@ -144,10 +144,6 @@ static int rcar_i2c_read_common(struct udevice *dev, struct i2c_msg *msg)
>>>  	u32 icmcr = RCAR_I2C_ICMCR_MDBS | RCAR_I2C_ICMCR_MIE;
>>>  	int i, ret = -EREMOTEIO;
>>>  
>>> -	ret = rcar_i2c_set_addr(dev, msg->addr, 1);
>>> -	if (ret)
>>> -		return ret;
>>> -
>>>  	for (i = 0; i < msg->len; i++) {
>>>  		if (msg->len - 1 == i)
>>>  			icmcr |= RCAR_I2C_ICMCR_FSB;
>>> @@ -174,10 +170,6 @@ static int rcar_i2c_write_common(struct udevice *dev, struct i2c_msg *msg)
>>>  	u32 icmcr = RCAR_I2C_ICMCR_MDBS | RCAR_I2C_ICMCR_MIE;
>>>  	int i, ret = -EREMOTEIO;
>>>  
>>> -	ret = rcar_i2c_set_addr(dev, msg->addr, 0);
>>> -	if (ret)
>>> -		return ret;
>>> -
>>>  	for (i = 0; i < msg->len; i++) {
>>>  		writel(msg->buf[i], priv->base + RCAR_I2C_ICRXD_ICTXD);
>>>  		writel(icmcr, priv->base + RCAR_I2C_ICMCR);
>>> @@ -201,6 +193,10 @@ static int rcar_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, int nmsgs)
>>>  	int ret;
>>>  
>>>  	for (; nmsgs > 0; nmsgs--, msg++) {
>>> +		ret = rcar_i2c_set_addr(dev, msg->addr, 1);
>>> +		if (ret)
>>> +			return -EREMOTEIO;
>>
>> Shouldn't you return ret here ? It seems like you fixed similar issue in
>> 4/6.
> 
> Correct. Thanks.
> 
>>>  		if (msg->flags & I2C_M_RD)
>>>  			ret = rcar_i2c_read_common(dev, msg);
>>>  		else
>>> @@ -210,7 +206,7 @@ static int rcar_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, int nmsgs)
>>>  			return ret;
>>>  	}
>>>  
>>> -	return ret;
>>> +	return 0;
>>
>> Is this change valid ?
> 
> Yes, ret is always checked, so it can only be 0.

OK

-- 
Best regards,
Marek Vasut