| Message ID | 20210924093011.26083-3-fercerpav@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v3,1/3] hwmon: tmp421: handle I2C errors | expand |
On Fri, Sep 24, 2021 at 12:30:11PM +0300, Paul Fertser wrote: > Old code produces -24999 for 0b1110011100000000 input in standard format due to > always rounding up rather than "away from zero". > > Use the common macro for division, unify and simplify the conversion code along > the way. > > Fixes: 9410700b881f ("hwmon: Add driver for Texas Instruments TMP421/422/423 sensor chips") > Signed-off-by: Paul Fertser <fercerpav@gmail.com> Applied. Thanks, Guenter > --- > > Changes from v2: > - Add Fixes: tag > > Changes from v1: > - Trivial rebase > > drivers/hwmon/tmp421.c | 24 ++++++++---------------- > 1 file changed, 8 insertions(+), 16 deletions(-) > > diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c > index 3a789f21188c..85f5f0eb3d2e 100644 > --- a/drivers/hwmon/tmp421.c > +++ b/drivers/hwmon/tmp421.c > @@ -100,23 +100,17 @@ struct tmp421_data { > s16 temp[4]; > }; > > -static int temp_from_s16(s16 reg) > +static int temp_from_raw(u16 reg, bool extended) > { > /* Mask out status bits */ > int temp = reg & ~0xf; > > - return (temp * 1000 + 128) / 256; > -} > - > -static int temp_from_u16(u16 reg) > -{ > - /* Mask out status bits */ > - int temp = reg & ~0xf; > - > - /* Add offset for extended temperature range. */ > - temp -= 64 * 256; > + if (extended) > + temp = temp - 64 * 256; > + else > + temp = (s16)temp; > > - return (temp * 1000 + 128) / 256; > + return DIV_ROUND_CLOSEST(temp * 1000, 256); > } > > static int tmp421_update_device(struct tmp421_data *data) > @@ -175,10 +169,8 @@ static int tmp421_read(struct device *dev, enum hwmon_sensor_types type, > > switch (attr) { > case hwmon_temp_input: > - if (tmp421->config & TMP421_CONFIG_RANGE) > - *val = temp_from_u16(tmp421->temp[channel]); > - else > - *val = temp_from_s16(tmp421->temp[channel]); > + *val = temp_from_raw(tmp421->temp[channel], > + tmp421->config & TMP421_CONFIG_RANGE); > return 0; > case hwmon_temp_fault: > /*
diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c index 3a789f21188c..85f5f0eb3d2e 100644 --- a/drivers/hwmon/tmp421.c +++ b/drivers/hwmon/tmp421.c @@ -100,23 +100,17 @@ struct tmp421_data { s16 temp[4]; }; -static int temp_from_s16(s16 reg) +static int temp_from_raw(u16 reg, bool extended) { /* Mask out status bits */ int temp = reg & ~0xf; - return (temp * 1000 + 128) / 256; -} - -static int temp_from_u16(u16 reg) -{ - /* Mask out status bits */ - int temp = reg & ~0xf; - - /* Add offset for extended temperature range. */ - temp -= 64 * 256; + if (extended) + temp = temp - 64 * 256; + else + temp = (s16)temp; - return (temp * 1000 + 128) / 256; + return DIV_ROUND_CLOSEST(temp * 1000, 256); } static int tmp421_update_device(struct tmp421_data *data) @@ -175,10 +169,8 @@ static int tmp421_read(struct device *dev, enum hwmon_sensor_types type, switch (attr) { case hwmon_temp_input: - if (tmp421->config & TMP421_CONFIG_RANGE) - *val = temp_from_u16(tmp421->temp[channel]); - else - *val = temp_from_s16(tmp421->temp[channel]); + *val = temp_from_raw(tmp421->temp[channel], + tmp421->config & TMP421_CONFIG_RANGE); return 0; case hwmon_temp_fault: /*
Old code produces -24999 for 0b1110011100000000 input in standard format due to always rounding up rather than "away from zero". Use the common macro for division, unify and simplify the conversion code along the way. Fixes: 9410700b881f ("hwmon: Add driver for Texas Instruments TMP421/422/423 sensor chips") Signed-off-by: Paul Fertser <fercerpav@gmail.com> --- Changes from v2: - Add Fixes: tag Changes from v1: - Trivial rebase drivers/hwmon/tmp421.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-)