projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
[cascardo/linux.git]
/
drivers
/
hwmon
/
w83791d.c
diff --git
a/drivers/hwmon/w83791d.c
b/drivers/hwmon/w83791d.c
index
ed397c6
..
38ddddd
100644
(file)
--- 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)
* in mV as would be measured on the chip input pin, need to just
* multiply/divide by 16 to translate from/to register values.
*/
* in mV as would be measured on the chip input pin, need to just
* multiply/divide by 16 to translate from/to register values.
*/
-#define IN_TO_REG(val) (
SENSORS_LIMIT
((((val) + 8) / 16), 0, 255))
+#define IN_TO_REG(val) (
clamp_val
((((val) + 8) / 16), 0, 255))
#define IN_FROM_REG(val) ((val) * 16)
static u8 fan_to_reg(long rpm, int div)
{
if (rpm == 0)
return 255;
#define IN_FROM_REG(val) ((val) * 16)
static u8 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 : \
}
#define FAN_FROM_REG(val, div) ((val) == 0 ? -1 : \
@@
-273,7
+273,7
@@
static u8 div_to_reg(int nr, long val)
int i;
/* fan divisors max out at 128 */
int i;
/* fan divisors max out at 128 */
- val =
SENSORS_LIMIT
(val, 1, 128) >> 1;
+ val =
clamp_val
(val, 1, 128) >> 1;
for (i = 0; i < 7; i++) {
if (val == 0)
break;
for (i = 0; i < 7; i++) {
if (val == 0)
break;
@@
-747,7
+747,7
@@
static ssize_t store_pwm(struct device *dev, struct device_attribute *attr,
return -EINVAL;
mutex_lock(&data->update_lock);
return -EINVAL;
mutex_lock(&data->update_lock);
- data->pwm[nr] =
SENSORS_LIMIT
(val, 0, 255);
+ data->pwm[nr] =
clamp_val
(val, 0, 255);
w83791d_write(client, W83791D_REG_PWM[nr], data->pwm[nr]);
mutex_unlock(&data->update_lock);
return count;
w83791d_write(client, W83791D_REG_PWM[nr], data->pwm[nr]);
mutex_unlock(&data->update_lock);
return count;