summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2005-07-28 23:14:59 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-05 09:14:17 -0700
commit53ae11b08353268c4012ef107bf205a0724d71aa (patch)
tree10820fdc417eb80a329a3326315fe74d5f545ae3
parentb6d7b3d1b5a388b7e9af2629a9ecccedee064078 (diff)
[PATCH] hwmon: move SENSORS_LIMIT to hwmon.h
Move SENSORS_LIMIT from i2c-sensor.h to hwmon.h, as it is in no way related to i2c. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/hwmon/lm75.h2
-rw-r--r--include/linux/hwmon.h11
-rw-r--r--include/linux/i2c-sensor.h12
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 @@
which contains this code, we don't worry about the wasted space.
*/
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
/* straight from the datasheet */
#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);
void hwmon_device_unregister(struct class_device *cdev);
+/* Scale user input to sensible values */
+static inline int SENSORS_LIMIT(long value, long low, long high)
+{
+ if (value < low)
+ return low;
+ else if (value > high)
+ return high;
+ else
+ return value;
+}
+
#endif
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,
struct i2c_address_data *address_data,
int (*found_proc) (struct i2c_adapter *, int, int));
-
-/* This macro is used to scale user-input to sensible values in almost all
- chip drivers. */
-static inline int SENSORS_LIMIT(long value, long low, long high)
-{
- if (value < low)
- return low;
- else if (value > high)
- return high;
- else
- return value;
-}
#endif /* def _LINUX_I2C_SENSOR_H */