Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-drm-fsl-dcu.git] / drivers / hwmon / smsc47m192.c

diff --git a/drivers/hwmon/smsc47m192.c b/drivers/hwmon/smsc47m192.c
index bdc4570acf9a868893c2de71709c51dd0d639a7e..a012f396f354d146a65a9128855e63f1aa6d0751 100644 (file)
--- a/drivers/hwmon/smsc47m192.c
+++ b/drivers/hwmon/smsc47m192.c
@@ -1,6 +1,6 @@
 /*
     smsc47m192.c - Support for hardware monitoring block of
-                   SMSC LPC47M192 and LPC47M997 Super I/O chips
+                   SMSC LPC47M192 and compatible Super I/O chips
 
     Copyright (C) 2006  Hartmut Rick <linux@rick.claranet.de>
 
@@ -30,6 +30,7 @@
 #include <linux/hwmon-sysfs.h>
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
+#include <linux/sysfs.h>
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
@@ -370,6 +371,75 @@ static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 0x0200);
 static SENSOR_DEVICE_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 0x0400);
 static SENSOR_DEVICE_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 0x0800);
 
+static struct attribute *smsc47m192_attributes[] = {
+       &sensor_dev_attr_in0_input.dev_attr.attr,
+       &sensor_dev_attr_in0_min.dev_attr.attr,
+       &sensor_dev_attr_in0_max.dev_attr.attr,
+       &sensor_dev_attr_in0_alarm.dev_attr.attr,
+       &sensor_dev_attr_in1_input.dev_attr.attr,
+       &sensor_dev_attr_in1_min.dev_attr.attr,
+       &sensor_dev_attr_in1_max.dev_attr.attr,
+       &sensor_dev_attr_in1_alarm.dev_attr.attr,
+       &sensor_dev_attr_in2_input.dev_attr.attr,
+       &sensor_dev_attr_in2_min.dev_attr.attr,
+       &sensor_dev_attr_in2_max.dev_attr.attr,
+       &sensor_dev_attr_in2_alarm.dev_attr.attr,
+       &sensor_dev_attr_in3_input.dev_attr.attr,
+       &sensor_dev_attr_in3_min.dev_attr.attr,
+       &sensor_dev_attr_in3_max.dev_attr.attr,
+       &sensor_dev_attr_in3_alarm.dev_attr.attr,
+       &sensor_dev_attr_in5_input.dev_attr.attr,
+       &sensor_dev_attr_in5_min.dev_attr.attr,
+       &sensor_dev_attr_in5_max.dev_attr.attr,
+       &sensor_dev_attr_in5_alarm.dev_attr.attr,
+       &sensor_dev_attr_in6_input.dev_attr.attr,
+       &sensor_dev_attr_in6_min.dev_attr.attr,
+       &sensor_dev_attr_in6_max.dev_attr.attr,
+       &sensor_dev_attr_in6_alarm.dev_attr.attr,
+       &sensor_dev_attr_in7_input.dev_attr.attr,
+       &sensor_dev_attr_in7_min.dev_attr.attr,
+       &sensor_dev_attr_in7_max.dev_attr.attr,
+       &sensor_dev_attr_in7_alarm.dev_attr.attr,
+
+       &sensor_dev_attr_temp1_input.dev_attr.attr,
+       &sensor_dev_attr_temp1_max.dev_attr.attr,
+       &sensor_dev_attr_temp1_min.dev_attr.attr,
+       &sensor_dev_attr_temp1_offset.dev_attr.attr,
+       &sensor_dev_attr_temp1_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp2_input.dev_attr.attr,
+       &sensor_dev_attr_temp2_max.dev_attr.attr,
+       &sensor_dev_attr_temp2_min.dev_attr.attr,
+       &sensor_dev_attr_temp2_offset.dev_attr.attr,
+       &sensor_dev_attr_temp2_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp2_input_fault.dev_attr.attr,
+       &sensor_dev_attr_temp3_input.dev_attr.attr,
+       &sensor_dev_attr_temp3_max.dev_attr.attr,
+       &sensor_dev_attr_temp3_min.dev_attr.attr,
+       &sensor_dev_attr_temp3_offset.dev_attr.attr,
+       &sensor_dev_attr_temp3_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp3_input_fault.dev_attr.attr,
+
+       &dev_attr_cpu0_vid.attr,
+       &dev_attr_vrm.attr,
+       NULL
+};
+
+static const struct attribute_group smsc47m192_group = {
+       .attrs = smsc47m192_attributes,
+};
+
+static struct attribute *smsc47m192_attributes_in4[] = {
+       &sensor_dev_attr_in4_input.dev_attr.attr,
+       &sensor_dev_attr_in4_min.dev_attr.attr,
+       &sensor_dev_attr_in4_max.dev_attr.attr,
+       &sensor_dev_attr_in4_alarm.dev_attr.attr,
+       NULL
+};
+
+static const struct attribute_group smsc47m192_group_in4 = {
+       .attrs = smsc47m192_attributes_in4,
+};
+
 /* This function is called when:
     * smsc47m192_driver is inserted (when this module is loaded), for each
       available adapter
@@ -448,7 +518,7 @@ static int smsc47m192_detect(struct i2c_adapter *adapter, int address,
                 && (i2c_smbus_read_byte_data(client,
                                SMSC47M192_REG_VID4) & 0xfe) == 0x80) {
                        dev_info(&adapter->dev,
-                                "found SMSC47M192 or SMSC47M997, "
+                                "found SMSC47M192 or compatible, "
                                 "version 2, stepping A%d\n", version & 0x0f);
                } else {
                        dev_dbg(&adapter->dev,
@@ -471,80 +541,28 @@ static int smsc47m192_detect(struct i2c_adapter *adapter, int address,
        smsc47m192_init_client(client);
 
        /* Register sysfs hooks */
-       data->class_dev = hwmon_device_register(&client->dev);
-       if (IS_ERR(data->class_dev)) {
-               err = PTR_ERR(data->class_dev);
+       if ((err = sysfs_create_group(&client->dev.kobj, &smsc47m192_group)))
                goto exit_detach;
-       }
-
-       device_create_file(&client->dev, &sensor_dev_attr_in0_input.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in0_min.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in0_max.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in0_alarm.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in1_input.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in1_min.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in1_max.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in1_alarm.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in2_input.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in2_min.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in2_max.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in2_alarm.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in3_input.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in3_min.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in3_max.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in3_alarm.dev_attr);
 
        /* Pin 110 is either in4 (+12V) or VID4 */
        config = i2c_smbus_read_byte_data(client, SMSC47M192_REG_CONFIG);
        if (!(config & 0x20)) {
-               device_create_file(&client->dev,
-                                  &sensor_dev_attr_in4_input.dev_attr);
-               device_create_file(&client->dev,
-                                  &sensor_dev_attr_in4_min.dev_attr);
-               device_create_file(&client->dev,
-                                  &sensor_dev_attr_in4_max.dev_attr);
-               device_create_file(&client->dev,
-                                  &sensor_dev_attr_in4_alarm.dev_attr);
+               if ((err = sysfs_create_group(&client->dev.kobj,
+                                             &smsc47m192_group_in4)))
+                       goto exit_remove_files;
+       }
+
+       data->class_dev = hwmon_device_register(&client->dev);
+       if (IS_ERR(data->class_dev)) {
+               err = PTR_ERR(data->class_dev);
+               goto exit_remove_files;
        }
-       device_create_file(&client->dev, &sensor_dev_attr_in5_input.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in5_min.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in5_max.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in5_alarm.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in6_input.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in6_min.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in6_max.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in6_alarm.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in7_input.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in7_min.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in7_max.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_in7_alarm.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_temp1_input.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_temp1_max.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_temp1_min.dev_attr);
-       device_create_file(&client->dev,
-                          &sensor_dev_attr_temp1_offset.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_temp1_alarm.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_temp2_input.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_temp2_max.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_temp2_min.dev_attr);
-       device_create_file(&client->dev,
-                          &sensor_dev_attr_temp2_offset.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_temp2_alarm.dev_attr);
-       device_create_file(&client->dev,
-                          &sensor_dev_attr_temp2_input_fault.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_temp3_input.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_temp3_max.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_temp3_min.dev_attr);
-       device_create_file(&client->dev,
-                          &sensor_dev_attr_temp3_offset.dev_attr);
-       device_create_file(&client->dev, &sensor_dev_attr_temp3_alarm.dev_attr);
-       device_create_file(&client->dev,
-                          &sensor_dev_attr_temp3_input_fault.dev_attr);
-       device_create_file(&client->dev, &dev_attr_cpu0_vid);
-       device_create_file(&client->dev, &dev_attr_vrm);
 
        return 0;
 
+exit_remove_files:
+       sysfs_remove_group(&client->dev.kobj, &smsc47m192_group);
+       sysfs_remove_group(&client->dev.kobj, &smsc47m192_group_in4);
 exit_detach:
        i2c_detach_client(client);
 exit_free:
@@ -559,6 +577,8 @@ static int smsc47m192_detach_client(struct i2c_client *client)
        int err;
 
        hwmon_device_unregister(data->class_dev);
+       sysfs_remove_group(&client->dev.kobj, &smsc47m192_group);
+       sysfs_remove_group(&client->dev.kobj, &smsc47m192_group_in4);
 
        if ((err = i2c_detach_client(client)))
                return err;