Merge branch 'cleanup/blocksize-diet-part2' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-block.git] / drivers / hwmon / w83791d.c

diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c
index bdcf2dce5ec4088e8f37f4c4c62d81f6e469b708..001df856913feba93790bf9383b2023115defad3 100644 (file)
--- a/drivers/hwmon/w83791d.c
+++ b/drivers/hwmon/w83791d.c
@@ -249,19 +249,16 @@ static u8 fan_to_reg(long rpm, int div)
  * the bottom 7 bits will always be zero
  */
 #define TEMP23_FROM_REG(val)   ((val) / 128 * 500)
-#define TEMP23_TO_REG(val)     ((val) <= -128000 ? 0x8000 : \
-                                (val) >= 127500 ? 0x7F80 : \
-                                (val) < 0 ? ((val) - 250) / 500 * 128 : \
-                                ((val) + 250) / 500 * 128)
+#define TEMP23_TO_REG(val)     (DIV_ROUND_CLOSEST(clamp_val((val), -128000, \
+                                                  127500), 500) * 128)
 
 /* for thermal cruise target temp, 7-bits, LSB = 1 degree Celsius */
-#define TARGET_TEMP_TO_REG(val)                ((val) < 0 ? 0 : \
-                                       (val) >= 127000 ? 127 : \
-                                       ((val) + 500) / 1000)
+#define TARGET_TEMP_TO_REG(val)        DIV_ROUND_CLOSEST(clamp_val((val), 0, 127000), \
+                                                 1000)
 
 /* for thermal cruise temp tolerance, 4-bits, LSB = 1 degree Celsius */
-#define TOL_TEMP_TO_REG(val)           ((val) >= 15000 ? 15 : \
-                                       ((val) + 500) / 1000)
+#define TOL_TEMP_TO_REG(val)   DIV_ROUND_CLOSEST(clamp_val((val), 0, 15000), \
+                                                 1000)
 
 #define BEEP_MASK_TO_REG(val)          ((val) & 0xffffff)
 #define BEEP_MASK_FROM_REG(val)                ((val) & 0xffffff)
@@ -1184,6 +1181,9 @@ static ssize_t store_vrm_reg(struct device *dev,
        if (err)
                return err;
 
+       if (val > 255)
+               return -EINVAL;
+
        data->vrm = val;
        return count;
 }