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/w83791d.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/w83791d.c')
-rw-r--r-- | drivers/hwmon/w83791d.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c index ed397c645198..38dddddf8875 100644 --- a/drivers/hwmon/w83791d.c +++ b/drivers/hwmon/w83791d.c | |||
@@ -220,15 +220,15 @@ static inline int w83791d_write(struct i2c_client *client, u8 reg, u8 value) | |||
220 | * in mV as would be measured on the chip input pin, need to just | 220 | * in mV as would be measured on the chip input pin, need to just |
221 | * multiply/divide by 16 to translate from/to register values. | 221 | * multiply/divide by 16 to translate from/to register values. |
222 | */ | 222 | */ |
223 | #define IN_TO_REG(val) (SENSORS_LIMIT((((val) + 8) / 16), 0, 255)) | 223 | #define IN_TO_REG(val) (clamp_val((((val) + 8) / 16), 0, 255)) |
224 | #define IN_FROM_REG(val) ((val) * 16) | 224 | #define IN_FROM_REG(val) ((val) * 16) |
225 | 225 | ||
226 | static u8 fan_to_reg(long rpm, int div) | 226 | static u8 fan_to_reg(long rpm, int div) |
227 | { | 227 | { |
228 | if (rpm == 0) | 228 | if (rpm == 0) |
229 | return 255; | 229 | return 255; |
230 | rpm = SENSORS_LIMIT(rpm, 1, 1000000); | 230 | rpm = clamp_val(rpm, 1, 1000000); |
231 | return SENSORS_LIMIT((1350000 + rpm * div / 2) / (rpm * div), 1, 254); | 231 | return clamp_val((1350000 + rpm * div / 2) / (rpm * div), 1, 254); |
232 | } | 232 | } |
233 | 233 | ||
234 | #define FAN_FROM_REG(val, div) ((val) == 0 ? -1 : \ | 234 | #define FAN_FROM_REG(val, div) ((val) == 0 ? -1 : \ |
@@ -273,7 +273,7 @@ static u8 div_to_reg(int nr, long val) | |||
273 | int i; | 273 | int i; |
274 | 274 | ||
275 | /* fan divisors max out at 128 */ | 275 | /* fan divisors max out at 128 */ |
276 | val = SENSORS_LIMIT(val, 1, 128) >> 1; | 276 | val = clamp_val(val, 1, 128) >> 1; |
277 | for (i = 0; i < 7; i++) { | 277 | for (i = 0; i < 7; i++) { |
278 | if (val == 0) | 278 | if (val == 0) |
279 | break; | 279 | break; |
@@ -747,7 +747,7 @@ static ssize_t store_pwm(struct device *dev, struct device_attribute *attr, | |||
747 | return -EINVAL; | 747 | return -EINVAL; |
748 | 748 | ||
749 | mutex_lock(&data->update_lock); | 749 | mutex_lock(&data->update_lock); |
750 | data->pwm[nr] = SENSORS_LIMIT(val, 0, 255); | 750 | data->pwm[nr] = clamp_val(val, 0, 255); |
751 | w83791d_write(client, W83791D_REG_PWM[nr], data->pwm[nr]); | 751 | w83791d_write(client, W83791D_REG_PWM[nr], data->pwm[nr]); |
752 | mutex_unlock(&data->update_lock); | 752 | mutex_unlock(&data->update_lock); |
753 | return count; | 753 | return count; |