hwmon: Replace SENSORS_LIMIT with clamp_val

SENSORS_LIMIT and the generic clamp_val have the same functionality,
and clamp_val is more efficient.

This patch reduces text size by 9052 bytes and bss size by 11624 bytes
for x86_64 builds.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: George Joseph <george.joseph@fairview5.com>
Acked-by: Jean Delvare <khali@linux-fr.org>

1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index 7430f70ae452..c347c94f2f73 100644
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -277,7 +277,7 @@ static inline int IN_FROM_REG(int reg, int nominal, int res)
 
 static inline int IN_TO_REG(int val, int nominal)
 {
-        return SENSORS_LIMIT((val * 192 + nominal / 2) / nominal, 0, 255);
+        return clamp_val((val * 192 + nominal / 2) / nominal, 0, 255);
 }
 
 /*
@@ -293,8 +293,7 @@ static inline int TEMP_FROM_REG(int reg, int res)
 
 static inline int TEMP_TO_REG(int val)
 {
-        return SENSORS_LIMIT((val < 0 ? val - 500 : val + 500) / 1000,
-                             -128, 127);
+        return clamp_val((val < 0 ? val - 500 : val + 500) / 1000, -128, 127);
 }
 
 /* Temperature range */
@@ -332,7 +331,7 @@ static inline int TEMP_HYST_FROM_REG(int reg, int ix)
 
 static inline int TEMP_HYST_TO_REG(int val, int ix, int reg)
 {
-        int hyst = SENSORS_LIMIT((val + 500) / 1000, 0, 15);
+        int hyst = clamp_val((val + 500) / 1000, 0, 15);
 
         return (ix == 1) ? (reg & 0xf0) | hyst : (reg & 0x0f) | (hyst << 4);
 }
@@ -349,10 +348,10 @@ static inline int FAN_FROM_REG(int reg, int tpc)
 static inline int FAN_TO_REG(int val, int tpc)
 {
         if (tpc) {
-                return SENSORS_LIMIT(val / tpc, 0, 0xffff);
+                return clamp_val(val / tpc, 0, 0xffff);
         } else {
                 return (val <= 0) ? 0xffff :
-                        SENSORS_LIMIT(90000 * 60 / val, 0, 0xfffe);
+                        clamp_val(90000 * 60 / val, 0, 0xfffe);
         }
 }
 
@@ -1282,7 +1281,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
         mutex_lock(&data->update_lock);
         switch (fn) {
         case SYS_PWM:
-                data->pwm[ix] = SENSORS_LIMIT(val, 0, 255);
+                data->pwm[ix] = clamp_val(val, 0, 255);
                 dme1737_write(data, DME1737_REG_PWM(ix), data->pwm[ix]);
                 break;
         case SYS_PWM_FREQ:
@@ -1450,7 +1449,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
                 break;
         case SYS_PWM_AUTO_POINT1_PWM:
                 /* Only valid for pwm[1-3] */
-                data->pwm_min[ix] = SENSORS_LIMIT(val, 0, 255);
+                data->pwm_min[ix] = clamp_val(val, 0, 255);
                 dme1737_write(data, DME1737_REG_PWM_MIN(ix),
                               data->pwm_min[ix]);
                 break;