Commit c67c0693 authored by Hans de Goede's avatar Hans de Goede Committed by Sebastian Reichel

power: supply: max17042_battery: Use sign_extend32 instead of DIY code

Use sign_extend32 to sign-extend variables where necessary instead of
DIY code.
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
parent 7f232af3
...@@ -106,13 +106,7 @@ static int max17042_get_temperature(struct max17042_chip *chip, int *temp) ...@@ -106,13 +106,7 @@ static int max17042_get_temperature(struct max17042_chip *chip, int *temp)
if (ret < 0) if (ret < 0)
return ret; return ret;
*temp = data; *temp = sign_extend32(data, 15);
/* The value is signed. */
if (*temp & 0x8000) {
*temp = (0x7fff & ~*temp) + 1;
*temp *= -1;
}
/* The value is converted into deci-centigrade scale */ /* The value is converted into deci-centigrade scale */
/* Units of LSB = 1 / 256 degree Celsius */ /* Units of LSB = 1 / 256 degree Celsius */
*temp = *temp * 10 / 256; *temp = *temp * 10 / 256;
...@@ -302,13 +296,7 @@ static int max17042_get_property(struct power_supply *psy, ...@@ -302,13 +296,7 @@ static int max17042_get_property(struct power_supply *psy,
if (ret < 0) if (ret < 0)
return ret; return ret;
val->intval = data; val->intval = sign_extend32(data, 15);
if (val->intval & 0x8000) {
/* Negative */
val->intval = ~val->intval & 0x7fff;
val->intval++;
val->intval *= -1;
}
val->intval *= 1562500 / chip->pdata->r_sns; val->intval *= 1562500 / chip->pdata->r_sns;
} else { } else {
return -EINVAL; return -EINVAL;
...@@ -320,13 +308,7 @@ static int max17042_get_property(struct power_supply *psy, ...@@ -320,13 +308,7 @@ static int max17042_get_property(struct power_supply *psy,
if (ret < 0) if (ret < 0)
return ret; return ret;
val->intval = data; val->intval = sign_extend32(data, 15);
if (val->intval & 0x8000) {
/* Negative */
val->intval = ~val->intval & 0x7fff;
val->intval++;
val->intval *= -1;
}
val->intval *= 1562500 / chip->pdata->r_sns; val->intval *= 1562500 / chip->pdata->r_sns;
} else { } else {
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment