diff options
author | Guenter Roeck <linux@roeck-us.net> | 2013-01-09 11:09:34 -0500 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2013-01-26 00:03:54 -0500 |
commit | 2a844c148e1f714ebf42cb96e1b172ce394c36c9 (patch) | |
tree | eb68eb8438f0470e7a81b022199abe5f6d866879 /drivers/hwmon/vt8231.c | |
parent | 142c090184ac7f9763c5d22509405da3486f9801 (diff) |
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>
Diffstat (limited to 'drivers/hwmon/vt8231.c')
-rw-r--r-- | drivers/hwmon/vt8231.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c index a56355cef184..988a2a796764 100644 --- a/drivers/hwmon/vt8231.c +++ b/drivers/hwmon/vt8231.c | |||
@@ -147,7 +147,7 @@ static inline u8 FAN_TO_REG(long rpm, int div) | |||
147 | { | 147 | { |
148 | if (rpm == 0) | 148 | if (rpm == 0) |
149 | return 0; | 149 | return 0; |
150 | return SENSORS_LIMIT(1310720 / (rpm * div), 1, 255); | 150 | return clamp_val(1310720 / (rpm * div), 1, 255); |
151 | } | 151 | } |
152 | 152 | ||
153 | #define FAN_FROM_REG(val, div) ((val) == 0 ? 0 : 1310720 / ((val) * (div))) | 153 | #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, | |||
236 | return err; | 236 | return err; |
237 | 237 | ||
238 | mutex_lock(&data->update_lock); | 238 | mutex_lock(&data->update_lock); |
239 | data->in_min[nr] = SENSORS_LIMIT(((val * 958) / 10000) + 3, 0, 255); | 239 | data->in_min[nr] = clamp_val(((val * 958) / 10000) + 3, 0, 255); |
240 | vt8231_write_value(data, regvoltmin[nr], data->in_min[nr]); | 240 | vt8231_write_value(data, regvoltmin[nr], data->in_min[nr]); |
241 | mutex_unlock(&data->update_lock); | 241 | mutex_unlock(&data->update_lock); |
242 | return count; | 242 | return count; |
@@ -256,7 +256,7 @@ static ssize_t set_in_max(struct device *dev, struct device_attribute *attr, | |||
256 | return err; | 256 | return err; |
257 | 257 | ||
258 | mutex_lock(&data->update_lock); | 258 | mutex_lock(&data->update_lock); |
259 | data->in_max[nr] = SENSORS_LIMIT(((val * 958) / 10000) + 3, 0, 255); | 259 | data->in_max[nr] = clamp_val(((val * 958) / 10000) + 3, 0, 255); |
260 | vt8231_write_value(data, regvoltmax[nr], data->in_max[nr]); | 260 | vt8231_write_value(data, regvoltmax[nr], data->in_max[nr]); |
261 | mutex_unlock(&data->update_lock); | 261 | mutex_unlock(&data->update_lock); |
262 | return count; | 262 | return count; |
@@ -302,8 +302,8 @@ static ssize_t set_in5_min(struct device *dev, struct device_attribute *attr, | |||
302 | return err; | 302 | return err; |
303 | 303 | ||
304 | mutex_lock(&data->update_lock); | 304 | mutex_lock(&data->update_lock); |
305 | data->in_min[5] = SENSORS_LIMIT(((val * 958 * 34) / (10000 * 54)) + 3, | 305 | data->in_min[5] = clamp_val(((val * 958 * 34) / (10000 * 54)) + 3, |
306 | 0, 255); | 306 | 0, 255); |
307 | vt8231_write_value(data, regvoltmin[5], data->in_min[5]); | 307 | vt8231_write_value(data, regvoltmin[5], data->in_min[5]); |
308 | mutex_unlock(&data->update_lock); | 308 | mutex_unlock(&data->update_lock); |
309 | return count; | 309 | return count; |
@@ -321,8 +321,8 @@ static ssize_t set_in5_max(struct device *dev, struct device_attribute *attr, | |||
321 | return err; | 321 | return err; |
322 | 322 | ||
323 | mutex_lock(&data->update_lock); | 323 | mutex_lock(&data->update_lock); |
324 | data->in_max[5] = SENSORS_LIMIT(((val * 958 * 34) / (10000 * 54)) + 3, | 324 | data->in_max[5] = clamp_val(((val * 958 * 34) / (10000 * 54)) + 3, |
325 | 0, 255); | 325 | 0, 255); |
326 | vt8231_write_value(data, regvoltmax[5], data->in_max[5]); | 326 | vt8231_write_value(data, regvoltmax[5], data->in_max[5]); |
327 | mutex_unlock(&data->update_lock); | 327 | mutex_unlock(&data->update_lock); |
328 | return count; | 328 | return count; |
@@ -380,7 +380,7 @@ static ssize_t set_temp0_max(struct device *dev, struct device_attribute *attr, | |||
380 | return err; | 380 | return err; |
381 | 381 | ||
382 | mutex_lock(&data->update_lock); | 382 | mutex_lock(&data->update_lock); |
383 | data->temp_max[0] = SENSORS_LIMIT((val + 500) / 1000, 0, 255); | 383 | data->temp_max[0] = clamp_val((val + 500) / 1000, 0, 255); |
384 | vt8231_write_value(data, regtempmax[0], data->temp_max[0]); | 384 | vt8231_write_value(data, regtempmax[0], data->temp_max[0]); |
385 | mutex_unlock(&data->update_lock); | 385 | mutex_unlock(&data->update_lock); |
386 | return count; | 386 | return count; |
@@ -397,7 +397,7 @@ static ssize_t set_temp0_min(struct device *dev, struct device_attribute *attr, | |||
397 | return err; | 397 | return err; |
398 | 398 | ||
399 | mutex_lock(&data->update_lock); | 399 | mutex_lock(&data->update_lock); |
400 | data->temp_min[0] = SENSORS_LIMIT((val + 500) / 1000, 0, 255); | 400 | data->temp_min[0] = clamp_val((val + 500) / 1000, 0, 255); |
401 | vt8231_write_value(data, regtempmin[0], data->temp_min[0]); | 401 | vt8231_write_value(data, regtempmin[0], data->temp_min[0]); |
402 | mutex_unlock(&data->update_lock); | 402 | mutex_unlock(&data->update_lock); |
403 | return count; | 403 | return count; |
@@ -444,7 +444,7 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr, | |||
444 | return err; | 444 | return err; |
445 | 445 | ||
446 | mutex_lock(&data->update_lock); | 446 | mutex_lock(&data->update_lock); |
447 | data->temp_max[nr] = SENSORS_LIMIT(TEMP_MAXMIN_TO_REG(val), 0, 255); | 447 | data->temp_max[nr] = clamp_val(TEMP_MAXMIN_TO_REG(val), 0, 255); |
448 | vt8231_write_value(data, regtempmax[nr], data->temp_max[nr]); | 448 | vt8231_write_value(data, regtempmax[nr], data->temp_max[nr]); |
449 | mutex_unlock(&data->update_lock); | 449 | mutex_unlock(&data->update_lock); |
450 | return count; | 450 | return count; |
@@ -463,7 +463,7 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr, | |||
463 | return err; | 463 | return err; |
464 | 464 | ||
465 | mutex_lock(&data->update_lock); | 465 | mutex_lock(&data->update_lock); |
466 | data->temp_min[nr] = SENSORS_LIMIT(TEMP_MAXMIN_TO_REG(val), 0, 255); | 466 | data->temp_min[nr] = clamp_val(TEMP_MAXMIN_TO_REG(val), 0, 255); |
467 | vt8231_write_value(data, regtempmin[nr], data->temp_min[nr]); | 467 | vt8231_write_value(data, regtempmin[nr], data->temp_min[nr]); |
468 | mutex_unlock(&data->update_lock); | 468 | mutex_unlock(&data->update_lock); |
469 | return count; | 469 | return count; |