diff options
Diffstat (limited to 'drivers/hwmon/lm80.c')
-rw-r--r-- | drivers/hwmon/lm80.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c index 28a8b71f4571..357fbb998728 100644 --- a/drivers/hwmon/lm80.c +++ b/drivers/hwmon/lm80.c | |||
@@ -72,15 +72,15 @@ static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, | |||
72 | * Fixing this is just not worth it. | 72 | * Fixing this is just not worth it. |
73 | */ | 73 | */ |
74 | 74 | ||
75 | #define IN_TO_REG(val) (SENSORS_LIMIT(((val) + 5) / 10, 0, 255)) | 75 | #define IN_TO_REG(val) (clamp_val(((val) + 5) / 10, 0, 255)) |
76 | #define IN_FROM_REG(val) ((val) * 10) | 76 | #define IN_FROM_REG(val) ((val) * 10) |
77 | 77 | ||
78 | static inline unsigned char FAN_TO_REG(unsigned rpm, unsigned div) | 78 | static inline unsigned char FAN_TO_REG(unsigned rpm, unsigned div) |
79 | { | 79 | { |
80 | if (rpm == 0) | 80 | if (rpm == 0) |
81 | return 255; | 81 | return 255; |
82 | rpm = SENSORS_LIMIT(rpm, 1, 1000000); | 82 | rpm = clamp_val(rpm, 1, 1000000); |
83 | return SENSORS_LIMIT((1350000 + rpm * div / 2) / (rpm * div), 1, 254); | 83 | return clamp_val((1350000 + rpm * div / 2) / (rpm * div), 1, 254); |
84 | } | 84 | } |
85 | 85 | ||
86 | #define FAN_FROM_REG(val, div) ((val) == 0 ? -1 : \ | 86 | #define FAN_FROM_REG(val, div) ((val) == 0 ? -1 : \ |
@@ -102,7 +102,7 @@ static inline long TEMP_FROM_REG(u16 temp) | |||
102 | #define TEMP_LIMIT_FROM_REG(val) (((val) > 0x80 ? \ | 102 | #define TEMP_LIMIT_FROM_REG(val) (((val) > 0x80 ? \ |
103 | (val) - 0x100 : (val)) * 1000) | 103 | (val) - 0x100 : (val)) * 1000) |
104 | 104 | ||
105 | #define TEMP_LIMIT_TO_REG(val) SENSORS_LIMIT((val) < 0 ? \ | 105 | #define TEMP_LIMIT_TO_REG(val) clamp_val((val) < 0 ? \ |
106 | ((val) - 500) / 1000 : ((val) + 500) / 1000, 0, 255) | 106 | ((val) - 500) / 1000 : ((val) + 500) / 1000, 0, 255) |
107 | 107 | ||
108 | #define DIV_FROM_REG(val) (1 << (val)) | 108 | #define DIV_FROM_REG(val) (1 << (val)) |