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, 8 insertions, 9 deletions

diff --git a/drivers/hwmon/w83l786ng.c b/drivers/hwmon/w83l786ng.c
index 79710bcac2f7..edb06cda5a68 100644
--- a/drivers/hwmon/w83l786ng.c
+++ b/drivers/hwmon/w83l786ng.c
@@ -86,8 +86,8 @@ FAN_TO_REG(long rpm, int div)
 {
         if (rpm == 0)
                 return 255;
-        rpm = SENSORS_LIMIT(rpm, 1, 1000000);
-        return SENSORS_LIMIT((1350000 + rpm * div / 2) / (rpm * div), 1, 254);
+        rpm = clamp_val(rpm, 1, 1000000);
+        return clamp_val((1350000 + rpm * div / 2) / (rpm * div), 1, 254);
 }
 
 #define FAN_FROM_REG(val, div)  ((val) == 0   ? -1 : \
@@ -95,9 +95,8 @@ FAN_TO_REG(long rpm, int div)
                                 1350000 / ((val) * (div))))
 
 /* for temp */
-#define TEMP_TO_REG(val)        (SENSORS_LIMIT(((val) < 0 ? \
-                                                (val) + 0x100 * 1000 \
-                                                : (val)) / 1000, 0, 0xff))
+#define TEMP_TO_REG(val)        (clamp_val(((val) < 0 ? (val) + 0x100 * 1000 \
+                                                      : (val)) / 1000, 0, 0xff))
 #define TEMP_FROM_REG(val)      (((val) & 0x80 ? \
                                   (val) - 0x100 : (val)) * 1000)
 
@@ -106,7 +105,7 @@ FAN_TO_REG(long rpm, int div)
  * in mV as would be measured on the chip input pin, need to just
  * multiply/divide by 8 to translate from/to register values.
  */
-#define IN_TO_REG(val)          (SENSORS_LIMIT((((val) + 4) / 8), 0, 255))
+#define IN_TO_REG(val)          (clamp_val((((val) + 4) / 8), 0, 255))
 #define IN_FROM_REG(val)        ((val) * 8)
 
 #define DIV_FROM_REG(val)       (1 << (val))
@@ -115,7 +114,7 @@ static inline u8
 DIV_TO_REG(long val)
 {
         int i;
-        val = SENSORS_LIMIT(val, 1, 128) >> 1;
+        val = clamp_val(val, 1, 128) >> 1;
         for (i = 0; i < 7; i++) {
                 if (val == 0)
                         break;
@@ -481,7 +480,7 @@ store_pwm(struct device *dev, struct device_attribute *attr,
         err = kstrtoul(buf, 10, &val);
         if (err)
                 return err;
-        val = SENSORS_LIMIT(val, 0, 255);
+        val = clamp_val(val, 0, 255);
 
         mutex_lock(&data->update_lock);
         data->pwm[nr] = val;
@@ -564,7 +563,7 @@ store_tolerance(struct device *dev, struct device_attribute *attr,
         mutex_lock(&data->update_lock);
         tol_mask = w83l786ng_read_value(client,
             W83L786NG_REG_TOLERANCE) & ((nr == 1) ? 0x0f : 0xf0);
-        tol_tmp = SENSORS_LIMIT(val, 0, 15);
+        tol_tmp = clamp_val(val, 0, 15);
         tol_tmp &= 0x0f;
         data->tolerance[nr] = tol_tmp;
         if (nr == 1)