From khali@linux-fr.org Sun Jul 31 13:15:24 2005 Date: Sun, 31 Jul 2005 22:12:09 +0200 From: Jean Delvare Cc: Greg KH Subject: hwmon: hwmon vs i2c, second round (11/11) Message-Id: <20050731221209.43c7f55d.khali@linux-fr.org> Use the common vid_from_reg function in lm78 rather than reimplementing it. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman --- drivers/hwmon/Kconfig | 1 + drivers/hwmon/lm78.c | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) --- gregkh-2.6.orig/drivers/hwmon/lm78.c 2005-08-08 15:02:21.000000000 -0700 +++ gregkh-2.6/drivers/hwmon/lm78.c 2005-08-08 15:02:25.000000000 -0700 @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -106,13 +107,6 @@ return val * 1000; } -/* VID: mV - REG: (see doc/vid) */ -static inline int VID_FROM_REG(u8 val) -{ - return val==0x1f ? 0 : val>=0x10 ? 5100-val*100 : 2050-val*50; -} - #define DIV_FROM_REG(val) (1 << (val)) /* There are some complications in a module like this. First off, LM78 chips @@ -457,7 +451,7 @@ static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf) { struct lm78_data *data = lm78_update_device(dev); - return sprintf(buf, "%d\n", VID_FROM_REG(data->vid)); + return sprintf(buf, "%d\n", vid_from_reg(82, data->vid)); } static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL); --- gregkh-2.6.orig/drivers/hwmon/Kconfig 2005-08-08 15:02:22.000000000 -0700 +++ gregkh-2.6/drivers/hwmon/Kconfig 2005-08-08 15:02:25.000000000 -0700 @@ -207,6 +207,7 @@ tristate "National Semiconductor LM78 and compatibles" depends on HWMON && I2C && EXPERIMENTAL select I2C_ISA + select HWMON_VID help If you say yes here you get support for National Semiconductor LM78, LM78-J and LM79.