floppy: remove dead/commented out code from floppy driver

[cascardo/linux.git] / drivers / hwmon / adm9240.c

diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c
index 43f6991..c17d0b6 100644 (file)
--- a/drivers/hwmon/adm9240.c
+++ b/drivers/hwmon/adm9240.c
@@ -5,7 +5,7 @@
  * Copyright (C) 1999  Frodo Looijaard <frodol@dds.nl>
  *                     Philip Edelbrock <phil@netroedge.com>
  * Copyright (C) 2003  Michiel Rook <michiel@grendelproject.nl>
- * Copyright (C) 2005  Grant Coady <gcoady@gmail.com> with valuable
+ * Copyright (C) 2005  Grant Coady <gcoady.lk@gmail.com> with valuable
  *                             guidance from Jean Delvare
  *
  * Driver supports     Analog Devices          ADM9240
@@ -150,7 +150,7 @@ static struct i2c_driver adm9240_driver = {
 struct adm9240_data {
        enum chips type;
        struct i2c_client client;
-       struct class_device *class_dev;
+       struct device *hwmon_dev;
        struct mutex update_lock;
        char valid;
        unsigned long last_updated_measure;
@@ -465,6 +465,45 @@ static ssize_t chassis_clear(struct device *dev,
 }
 static DEVICE_ATTR(chassis_clear, S_IWUSR, NULL, chassis_clear);
 
+static struct attribute *adm9240_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_in1_input.dev_attr.attr,
+       &sensor_dev_attr_in1_min.dev_attr.attr,
+       &sensor_dev_attr_in1_max.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_in3_input.dev_attr.attr,
+       &sensor_dev_attr_in3_min.dev_attr.attr,
+       &sensor_dev_attr_in3_max.dev_attr.attr,
+       &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_in5_input.dev_attr.attr,
+       &sensor_dev_attr_in5_min.dev_attr.attr,
+       &sensor_dev_attr_in5_max.dev_attr.attr,
+       &dev_attr_temp1_input.attr,
+       &sensor_dev_attr_temp1_max.dev_attr.attr,
+       &sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
+       &sensor_dev_attr_fan1_input.dev_attr.attr,
+       &sensor_dev_attr_fan1_div.dev_attr.attr,
+       &sensor_dev_attr_fan1_min.dev_attr.attr,
+       &sensor_dev_attr_fan2_input.dev_attr.attr,
+       &sensor_dev_attr_fan2_div.dev_attr.attr,
+       &sensor_dev_attr_fan2_min.dev_attr.attr,
+       &dev_attr_alarms.attr,
+       &dev_attr_aout_output.attr,
+       &dev_attr_chassis_clear.attr,
+       &dev_attr_cpu0_vid.attr,
+       NULL
+};
+
+static const struct attribute_group adm9240_group = {
+       .attrs = adm9240_attributes,
+};
+
 
 /*** sensor chip detect and driver install ***/
 
@@ -548,72 +587,19 @@ static int adm9240_detect(struct i2c_adapter *adapter, int address, int kind)
        adm9240_init_client(new_client);
 
        /* populate sysfs filesystem */
-       data->class_dev = hwmon_device_register(&new_client->dev);
-       if (IS_ERR(data->class_dev)) {
-               err = PTR_ERR(data->class_dev);
+       if ((err = sysfs_create_group(&new_client->dev.kobj, &adm9240_group)))
                goto exit_detach;
-       }
 
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in0_input.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in0_min.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in0_max.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in1_input.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in1_min.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in1_max.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in2_input.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in2_min.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in2_max.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in3_input.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in3_min.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in3_max.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in4_input.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in4_min.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in4_max.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in5_input.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in5_min.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_in5_max.dev_attr);
-       device_create_file(&new_client->dev, &dev_attr_temp1_input);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_temp1_max.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_temp1_max_hyst.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_fan1_input.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_fan1_div.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_fan1_min.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_fan2_input.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_fan2_div.dev_attr);
-       device_create_file(&new_client->dev,
-                       &sensor_dev_attr_fan2_min.dev_attr);
-       device_create_file(&new_client->dev, &dev_attr_alarms);
-       device_create_file(&new_client->dev, &dev_attr_aout_output);
-       device_create_file(&new_client->dev, &dev_attr_chassis_clear);
-       device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
+       data->hwmon_dev = hwmon_device_register(&new_client->dev);
+       if (IS_ERR(data->hwmon_dev)) {
+               err = PTR_ERR(data->hwmon_dev);
+               goto exit_remove;
+       }
 
        return 0;
 
+exit_remove:
+       sysfs_remove_group(&new_client->dev.kobj, &adm9240_group);
 exit_detach:
        i2c_detach_client(new_client);
 exit_free:
@@ -634,7 +620,8 @@ static int adm9240_detach_client(struct i2c_client *client)
        struct adm9240_data *data = i2c_get_clientdata(client);
        int err;
 
-       hwmon_device_unregister(data->class_dev);
+       hwmon_device_unregister(data->hwmon_dev);
+       sysfs_remove_group(&client->dev.kobj, &adm9240_group);
 
        if ((err = i2c_detach_client(client)))
                return err;
@@ -787,7 +774,7 @@ static void __exit sensors_adm9240_exit(void)
 }
 
 MODULE_AUTHOR("Michiel Rook <michiel@grendelproject.nl>, "
-               "Grant Coady <gcoady@gmail.com> and others");
+               "Grant Coady <gcoady.lk@gmail.com> and others");
 MODULE_DESCRIPTION("ADM9240/DS1780/LM81 driver");
 MODULE_LICENSE("GPL");