diff options
-rw-r--r-- | drivers/hwmon/lm75.h | 2 | ||||
-rw-r--r-- | include/linux/hwmon.h | 11 | ||||
-rw-r--r-- | include/linux/i2c-sensor.h | 12 |
3 files changed, 12 insertions, 13 deletions
diff --git a/drivers/hwmon/lm75.h b/drivers/hwmon/lm75.h index 63e3f2fb4c21..af7dc650ee15 100644 --- a/drivers/hwmon/lm75.h +++ b/drivers/hwmon/lm75.h | |||
@@ -25,7 +25,7 @@ | |||
25 | which contains this code, we don't worry about the wasted space. | 25 | which contains this code, we don't worry about the wasted space. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <linux/i2c-sensor.h> | 28 | #include <linux/hwmon.h> |
29 | 29 | ||
30 | /* straight from the datasheet */ | 30 | /* straight from the datasheet */ |
31 | #define LM75_TEMP_MIN (-55000) | 31 | #define LM75_TEMP_MIN (-55000) |
diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h index bf90e6001e3b..0efd994c37f1 100644 --- a/include/linux/hwmon.h +++ b/include/linux/hwmon.h | |||
@@ -20,5 +20,16 @@ struct class_device *hwmon_device_register(struct device *dev); | |||
20 | 20 | ||
21 | void hwmon_device_unregister(struct class_device *cdev); | 21 | void hwmon_device_unregister(struct class_device *cdev); |
22 | 22 | ||
23 | /* Scale user input to sensible values */ | ||
24 | static inline int SENSORS_LIMIT(long value, long low, long high) | ||
25 | { | ||
26 | if (value < low) | ||
27 | return low; | ||
28 | else if (value > high) | ||
29 | return high; | ||
30 | else | ||
31 | return value; | ||
32 | } | ||
33 | |||
23 | #endif | 34 | #endif |
24 | 35 | ||
diff --git a/include/linux/i2c-sensor.h b/include/linux/i2c-sensor.h index ae73b9e789cb..e832d3286a46 100644 --- a/include/linux/i2c-sensor.h +++ b/include/linux/i2c-sensor.h | |||
@@ -242,16 +242,4 @@ extern int i2c_detect(struct i2c_adapter *adapter, | |||
242 | struct i2c_address_data *address_data, | 242 | struct i2c_address_data *address_data, |
243 | int (*found_proc) (struct i2c_adapter *, int, int)); | 243 | int (*found_proc) (struct i2c_adapter *, int, int)); |
244 | 244 | ||
245 | |||
246 | /* This macro is used to scale user-input to sensible values in almost all | ||
247 | chip drivers. */ | ||
248 | static inline int SENSORS_LIMIT(long value, long low, long high) | ||
249 | { | ||
250 | if (value < low) | ||
251 | return low; | ||
252 | else if (value > high) | ||
253 | return high; | ||
254 | else | ||
255 | return value; | ||
256 | } | ||
257 | #endif /* def _LINUX_I2C_SENSOR_H */ | 245 | #endif /* def _LINUX_I2C_SENSOR_H */ |