[PATCH] I2C hwmon: add hwmon sysfs class to drivers

This patch modifies sensors chip drivers to make use of the new
sysfs class "hwmon".

Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 15 insertions, 1 deletions

diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
index 8100595feb44..dbf8df386250 100644
--- a/drivers/hwmon/lm80.c
+++ b/drivers/hwmon/lm80.c
@@ -27,6 +27,8 @@
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
 #include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c,
@@ -107,6 +109,7 @@ static inline long TEMP_FROM_REG(u16 temp)
 
 struct lm80_data {
         struct i2c_client client;
+        struct class_device *class_dev;
         struct semaphore update_lock;
         char valid;             /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
@@ -451,6 +454,12 @@ int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
         data->fan_min[1] = lm80_read_value(new_client, LM80_REG_FAN_MIN(2));
 
         /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto error_detach;
+        }
+
         device_create_file(&new_client->dev, &dev_attr_in0_min);
         device_create_file(&new_client->dev, &dev_attr_in1_min);
         device_create_file(&new_client->dev, &dev_attr_in2_min);
@@ -487,6 +496,8 @@ int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
 
         return 0;
 
+error_detach:
+        i2c_detach_client(new_client);
 error_free:
         kfree(data);
 exit:
@@ -495,15 +506,18 @@ exit:
 
 static int lm80_detach_client(struct i2c_client *client)
 {
+        struct lm80_data *data = i2c_get_clientdata(client);
         int err;
 
+        hwmon_device_unregister(data->class_dev);
+
         if ((err = i2c_detach_client(client))) {
                 dev_err(&client->dev, "Client deregistration failed, "
                         "client not detached.\n");
                 return err;
         }
 
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
         return 0;
 }