Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: (53 commits)
  hwmon: (vt8231) fix sparse warning
  hwmon: (sis5595) fix sparse warning
  hwmon: (w83627hf) don't assume bank 0
  hwmon: (w83627hf) Fix setting fan min right after driver load
  hwmon: (w83627hf) De-macro sysfs callback functions
  hwmon: Add new combined driver for FSC chips
  hwmon: (ibmpex) Release IPMI user if hwmon registration fails
  hwmon: (dme1737) Add sch311x support
  hwmon: (dme1737) group functions logically
  hwmon: (dme1737) cleanups
  hwmon: IBM power meter driver
  hwmon: (coretemp) Add support for Celeron 4xx
  hwmon: (lm87) Disable VID when it should be
  hwmon: (w83781d) Add individual alarm and beep files
  hwmon: VRM is not read from registers
  MAINTAINERS: update hwmon subsystem git trees
  hwmon: Fix the code examples in documentation
  hwmon: update sysfs interface document - error handling
  hwmon: (thmc50) Fix a debug message
  hwmon: (thmc50) Don't create temp3 if not enabled
  ...

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index d9a9ec7dd84a..b15c6a998b72 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -223,7 +223,7 @@ temp1_from_reg(s8 reg)
 }
 
 static inline s8
-temp1_to_reg(int temp, int min, int max)
+temp1_to_reg(long temp, int min, int max)
 {
         if (temp <= min)
                 return min / 1000;
@@ -256,7 +256,7 @@ struct w83627ehf_data {
         int addr;       /* IO base of hw monitor block */
         const char *name;
 
-        struct class_device *class_dev;
+        struct device *hwmon_dev;
         struct mutex lock;
 
         struct mutex update_lock;
@@ -805,7 +805,7 @@ store_temp1_##reg(struct device *dev, struct device_attribute *attr, \
                   const char *buf, size_t count) \
 { \
         struct w83627ehf_data *data = dev_get_drvdata(dev); \
-        u32 val = simple_strtoul(buf, NULL, 10); \
+        long val = simple_strtol(buf, NULL, 10); \
  \
         mutex_lock(&data->update_lock); \
         data->temp1_##reg = temp1_to_reg(val, -128000, 127000); \
@@ -840,7 +840,7 @@ store_##reg(struct device *dev, struct device_attribute *attr, \
         struct w83627ehf_data *data = dev_get_drvdata(dev); \
         struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \
         int nr = sensor_attr->index; \
-        u32 val = simple_strtoul(buf, NULL, 10); \
+        long val = simple_strtol(buf, NULL, 10); \
  \
         mutex_lock(&data->update_lock); \
         data->reg[nr] = LM75_TEMP_TO_REG(val); \
@@ -1384,9 +1384,9 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
                         goto exit_remove;
         }
 
-        data->class_dev = hwmon_device_register(dev);
-        if (IS_ERR(data->class_dev)) {
-                err = PTR_ERR(data->class_dev);
+        data->hwmon_dev = hwmon_device_register(dev);
+        if (IS_ERR(data->hwmon_dev)) {
+                err = PTR_ERR(data->hwmon_dev);
                 goto exit_remove;
         }
 
@@ -1406,7 +1406,7 @@ static int __devexit w83627ehf_remove(struct platform_device *pdev)
 {
         struct w83627ehf_data *data = platform_get_drvdata(pdev);
 
-        hwmon_device_unregister(data->class_dev);
+        hwmon_device_unregister(data->hwmon_dev);
         w83627ehf_device_remove_files(&pdev->dev);
         release_region(data->addr, IOREGION_LENGTH);
         platform_set_drvdata(pdev, NULL);