aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/lm77.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-07 16:29:27 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-07 16:29:27 -0800
commitb4669d66fb1488fd9cebe0b8da447cfeb86109ba (patch)
tree2beaba0e7d8acac9703667aff5f9bc9f4d4357d6 /drivers/hwmon/lm77.c
parentb43d4ddaec2b33fd6eaf0bed970c86ab08a52aaf (diff)
parentc5e3fbf22ccba0879b174fab7ec0e322b1266c2c (diff)
downloadkernel_samsung_smdk4412-b4669d66fb1488fd9cebe0b8da447cfeb86109ba.zip
kernel_samsung_smdk4412-b4669d66fb1488fd9cebe0b8da447cfeb86109ba.tar.gz
kernel_samsung_smdk4412-b4669d66fb1488fd9cebe0b8da447cfeb86109ba.tar.bz2
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/hwmon/lm77.c')
-rw-r--r--drivers/hwmon/lm77.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hwmon/lm77.c b/drivers/hwmon/lm77.c
index a2f420d..df9e02a 100644
--- a/drivers/hwmon/lm77.c
+++ b/drivers/hwmon/lm77.c
@@ -87,15 +87,15 @@ static struct i2c_driver lm77_driver = {
/* In the temperature registers, the low 3 bits are not part of the
temperature values; they are the status bits. */
-static inline u16 LM77_TEMP_TO_REG(int temp)
+static inline s16 LM77_TEMP_TO_REG(int temp)
{
int ntemp = SENSORS_LIMIT(temp, LM77_TEMP_MIN, LM77_TEMP_MAX);
- return (u16)((ntemp / 500) * 8);
+ return (ntemp / 500) * 8;
}
-static inline int LM77_TEMP_FROM_REG(u16 reg)
+static inline int LM77_TEMP_FROM_REG(s16 reg)
{
- return ((int)reg / 8) * 500;
+ return (reg / 8) * 500;
}
/* sysfs stuff */