Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

[firefly-linux-kernel-4.4.55.git] / drivers / hwmon / emc6w201.c

diff --git a/drivers/hwmon/emc6w201.c b/drivers/hwmon/emc6w201.c
index 789bd4fb329b9b2eeca82b07751ab538b5c19e9a..82e661e8241b7a15cf8c32ce57a048429704a2cd 100644 (file)
--- a/drivers/hwmon/emc6w201.c
+++ b/drivers/hwmon/emc6w201.c
@@ -49,7 +49,7 @@ static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 #define EMC6W201_REG_TEMP_HIGH(nr)     (0x57 + (nr) * 2)
 #define EMC6W201_REG_FAN_MIN(nr)       (0x62 + (nr) * 2)
 
-enum { input, min, max } subfeature;
+enum subfeature { input, min, max };
 
 /*
  * Per-device data
@@ -220,7 +220,7 @@ static ssize_t set_in(struct device *dev, struct device_attribute *devattr,
                          : EMC6W201_REG_IN_HIGH(nr);
 
        mutex_lock(&data->update_lock);
-       data->in[sf][nr] = SENSORS_LIMIT(val, 0, 255);
+       data->in[sf][nr] = clamp_val(val, 0, 255);
        err = emc6w201_write8(client, reg, data->in[sf][nr]);
        mutex_unlock(&data->update_lock);
 
@@ -257,7 +257,7 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *devattr,
                          : EMC6W201_REG_TEMP_HIGH(nr);
 
        mutex_lock(&data->update_lock);
-       data->temp[sf][nr] = SENSORS_LIMIT(val, -127, 128);
+       data->temp[sf][nr] = clamp_val(val, -127, 128);
        err = emc6w201_write8(client, reg, data->temp[sf][nr]);
        mutex_unlock(&data->update_lock);
 
@@ -298,7 +298,7 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *devattr,
                val = 0xFFFF;
        } else {
                val = DIV_ROUND_CLOSEST(5400000U, val);
-               val = SENSORS_LIMIT(val, 0, 0xFFFE);
+               val = clamp_val(val, 0, 0xFFFE);
        }
 
        mutex_lock(&data->update_lock);