hwmon: Replace SENSORS_LIMIT with clamp_val

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

diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index a56355cef184863fc1a9aadeffb83908ba7bfead..988a2a79676496e3acd7ec5e1e8e4c1399c9bf39 100644 (file)
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -147,7 +147,7 @@ static inline u8 FAN_TO_REG(long rpm, int div)
 {
        if (rpm == 0)
                return 0;
-       return SENSORS_LIMIT(1310720 / (rpm * div), 1, 255);
+       return clamp_val(1310720 / (rpm * div), 1, 255);
 }
 
 #define FAN_FROM_REG(val, div) ((val) == 0 ? 0 : 1310720 / ((val) * (div)))
@@ -236,7 +236,7 @@ static ssize_t set_in_min(struct device *dev, struct device_attribute *attr,
                return err;
 
        mutex_lock(&data->update_lock);
-       data->in_min[nr] = SENSORS_LIMIT(((val * 958) / 10000) + 3, 0, 255);
+       data->in_min[nr] = clamp_val(((val * 958) / 10000) + 3, 0, 255);
        vt8231_write_value(data, regvoltmin[nr], data->in_min[nr]);
        mutex_unlock(&data->update_lock);
        return count;
@@ -256,7 +256,7 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *attr,
                return err;
 
        mutex_lock(&data->update_lock);
-       data->in_max[nr] = SENSORS_LIMIT(((val * 958) / 10000) + 3, 0, 255);
+       data->in_max[nr] = clamp_val(((val * 958) / 10000) + 3, 0, 255);
        vt8231_write_value(data, regvoltmax[nr], data->in_max[nr]);
        mutex_unlock(&data->update_lock);
        return count;
@@ -302,8 +302,8 @@ static ssize_t set_in5_min(struct device *dev, struct device_attribute *attr,
                return err;
 
        mutex_lock(&data->update_lock);
-       data->in_min[5] = SENSORS_LIMIT(((val * 958 * 34) / (10000 * 54)) + 3,
-                                       0, 255);
+       data->in_min[5] = clamp_val(((val * 958 * 34) / (10000 * 54)) + 3,
+                                   0, 255);
        vt8231_write_value(data, regvoltmin[5], data->in_min[5]);
        mutex_unlock(&data->update_lock);
        return count;
@@ -321,8 +321,8 @@ static ssize_t set_in5_max(struct device *dev, struct device_attribute *attr,
                return err;
 
        mutex_lock(&data->update_lock);
-       data->in_max[5] = SENSORS_LIMIT(((val * 958 * 34) / (10000 * 54)) + 3,
-                                       0, 255);
+       data->in_max[5] = clamp_val(((val * 958 * 34) / (10000 * 54)) + 3,
+                                   0, 255);
        vt8231_write_value(data, regvoltmax[5], data->in_max[5]);
        mutex_unlock(&data->update_lock);
        return count;
@@ -380,7 +380,7 @@ static ssize_t set_temp0_max(struct device *dev, struct device_attribute *attr,
                return err;
 
        mutex_lock(&data->update_lock);
-       data->temp_max[0] = SENSORS_LIMIT((val + 500) / 1000, 0, 255);
+       data->temp_max[0] = clamp_val((val + 500) / 1000, 0, 255);
        vt8231_write_value(data, regtempmax[0], data->temp_max[0]);
        mutex_unlock(&data->update_lock);
        return count;
@@ -397,7 +397,7 @@ static ssize_t set_temp0_min(struct device *dev, struct device_attribute *attr,
                return err;
 
        mutex_lock(&data->update_lock);
-       data->temp_min[0] = SENSORS_LIMIT((val + 500) / 1000, 0, 255);
+       data->temp_min[0] = clamp_val((val + 500) / 1000, 0, 255);
        vt8231_write_value(data, regtempmin[0], data->temp_min[0]);
        mutex_unlock(&data->update_lock);
        return count;
@@ -444,7 +444,7 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
                return err;
 
        mutex_lock(&data->update_lock);
-       data->temp_max[nr] = SENSORS_LIMIT(TEMP_MAXMIN_TO_REG(val), 0, 255);
+       data->temp_max[nr] = clamp_val(TEMP_MAXMIN_TO_REG(val), 0, 255);
        vt8231_write_value(data, regtempmax[nr], data->temp_max[nr]);
        mutex_unlock(&data->update_lock);
        return count;
@@ -463,7 +463,7 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
                return err;
 
        mutex_lock(&data->update_lock);
-       data->temp_min[nr] = SENSORS_LIMIT(TEMP_MAXMIN_TO_REG(val), 0, 255);
+       data->temp_min[nr] = clamp_val(TEMP_MAXMIN_TO_REG(val), 0, 255);
        vt8231_write_value(data, regtempmin[nr], data->temp_min[nr]);
        mutex_unlock(&data->update_lock);
        return count;