Hi Dan-san, Thank you so much. Looks good.
Reviewed-by: Tokunori Ikegami <[email protected]> Regards, Ikegami > -----Original Message----- > From: Dan Carpenter [mailto:[email protected]] > Sent: Tuesday, August 14, 2018 7:08 PM > To: Jean Delvare; IKEGAMI Tokunori > Cc: Guenter Roeck; [email protected]; > [email protected] > Subject: [PATCH 2/2 v2] hwmon: (adt7475) Make adt7475_read_word() return > errors > > The adt7475_read_word() function was meant to return negative error > codes on failure. > > Signed-off-by: Dan Carpenter <[email protected]> > --- > v2: In my first patch I just removed the error handling in the callers > > diff --git a/drivers/hwmon/adt7475.c b/drivers/hwmon/adt7475.c > index 90837f7c7d0f..ec03359536aa 100644 > --- a/drivers/hwmon/adt7475.c > +++ b/drivers/hwmon/adt7475.c > @@ -302,14 +302,18 @@ static inline u16 volt2reg(int channel, long volt, > u8 bypass_attn) > return clamp_val(reg, 0, 1023) & (0xff << 2); > } > > -static u16 adt7475_read_word(struct i2c_client *client, int reg) > +static int adt7475_read_word(struct i2c_client *client, int reg) > { > - u16 val; > + int val1, val2; > > - val = i2c_smbus_read_byte_data(client, reg); > - val |= (i2c_smbus_read_byte_data(client, reg + 1) << 8); > + val1 = i2c_smbus_read_byte_data(client, reg); > + if (val1 < 0) > + return val1; > + val2 = i2c_smbus_read_byte_data(client, reg + 1); > + if (val2 < 0) > + return val2; > > - return val; > + return val1 | (val2 << 8); > } > > static void adt7475_write_word(struct i2c_client *client, int reg, u16 > val)
