summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2015-01-19 02:27:55 +0100
committerGuenter Roeck <linux@roeck-us.net>2015-01-26 06:23:59 +0100
commitbca6a1ada0464b7179f34f9af62bcdfd60c223e7 (patch)
treef80e174290624521ea1e797e23429a27c343bf77 /drivers/hwmon
parenthwmon: (ina2xx) Add ina231 compatible string (diff)
downloadlinux-bca6a1ada0464b7179f34f9af62bcdfd60c223e7.tar.xz
linux-bca6a1ada0464b7179f34f9af62bcdfd60c223e7.zip
hwmon: (jc42) Use sign_extend32 for sign extension
Despite the name, sign_extend32 works just fine for 16 bit variables, so it is safe to use. Cc: Martin Kepplinger <martink@posteo.de> Reviewed-by: Jean Delvare <jdelvare@suse.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/jc42.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/hwmon/jc42.c b/drivers/hwmon/jc42.c
index 388f8bcd898e..262d8086822f 100644
--- a/drivers/hwmon/jc42.c
+++ b/drivers/hwmon/jc42.c
@@ -213,11 +213,7 @@ static u16 jc42_temp_to_reg(int temp, bool extended)
static int jc42_temp_from_reg(s16 reg)
{
- reg &= 0x1fff;
-
- /* sign extend register */
- if (reg & 0x1000)
- reg |= 0xf000;
+ reg = sign_extend32(reg, 12);
/* convert from 0.0625 to 0.001 resolution */
return reg * 125 / 2;