hwmon: Replace SENSORS_LIMIT with clamp_val

[mirror_ubuntu-zesty-kernel.git] / drivers / hwmon / via686a.c

diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index e0e14a9f1658b4d01bb6871aa4b29ae9d8cb627a..3123b30208c580064596bbc41f3e1e9e168957b9 100644 (file)
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -135,17 +135,14 @@ static inline u8 IN_TO_REG(long val, int inNum)
         * for the constants.
         */
        if (inNum <= 1)
-               return (u8)
-                   SENSORS_LIMIT((val * 21024 - 1205000) / 250000, 0, 255);
+               return (u8) clamp_val((val * 21024 - 1205000) / 250000, 0, 255);
        else if (inNum == 2)
-               return (u8)
-                   SENSORS_LIMIT((val * 15737 - 1205000) / 250000, 0, 255);
+               return (u8) clamp_val((val * 15737 - 1205000) / 250000, 0, 255);
        else if (inNum == 3)
-               return (u8)
-                   SENSORS_LIMIT((val * 10108 - 1205000) / 250000, 0, 255);
+               return (u8) clamp_val((val * 10108 - 1205000) / 250000, 0, 255);
        else
-               return (u8)
-                   SENSORS_LIMIT((val * 41714 - 12050000) / 2500000, 0, 255);
+               return (u8) clamp_val((val * 41714 - 12050000) / 2500000, 0,
+                                     255);
 }
 
 static inline long IN_FROM_REG(u8 val, int inNum)
@@ -175,8 +172,8 @@ static inline u8 FAN_TO_REG(long rpm, int div)
 {
        if (rpm == 0)
                return 0;
-       rpm = SENSORS_LIMIT(rpm, 1, 1000000);
-       return SENSORS_LIMIT((1350000 + rpm * div / 2) / (rpm * div), 1, 255);
+       rpm = clamp_val(rpm, 1, 1000000);
+       return clamp_val((1350000 + rpm * div / 2) / (rpm * div), 1, 255);
 }
 
 #define FAN_FROM_REG(val, div) ((val) == 0 ? 0 : (val) == 255 ? 0 : 1350000 / \