kprobes: fix error checking of batch registration

[pandora-kernel.git] / drivers / hwmon / fscpos.c

diff --git a/drivers/hwmon/fscpos.c b/drivers/hwmon/fscpos.c
index 6dc4846..00f4848 100644 (file)
--- a/drivers/hwmon/fscpos.c
+++ b/drivers/hwmon/fscpos.c
@@ -38,11 +38,12 @@
 #include <linux/hwmon.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
+#include <linux/sysfs.h>
 
 /*
  * Addresses to scan
  */
-static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
 
 /*
  * Insmod parameters
@@ -104,7 +105,6 @@ static struct i2c_driver fscpos_driver = {
        .driver = {
                .name   = "fscpos",
        },
-       .id             = I2C_DRIVERID_FSCPOS,
        .attach_adapter = fscpos_attach_adapter,
        .detach_client  = fscpos_detach_client,
 };
@@ -114,7 +114,7 @@ static struct i2c_driver fscpos_driver = {
  */
 struct fscpos_data {
        struct i2c_client client;
-       struct class_device *class_dev;
+       struct device *hwmon_dev;
        struct mutex update_lock;
        char valid;             /* 0 until following fields are valid */
        unsigned long last_updated;     /* In jiffies */
@@ -432,6 +432,44 @@ static DEVICE_ATTR(in0_input, S_IRUGO, show_volt_12, NULL);
 static DEVICE_ATTR(in1_input, S_IRUGO, show_volt_5, NULL);
 static DEVICE_ATTR(in2_input, S_IRUGO, show_volt_batt, NULL);
 
+static struct attribute *fscpos_attributes[] = {
+       &dev_attr_event.attr,
+       &dev_attr_in0_input.attr,
+       &dev_attr_in1_input.attr,
+       &dev_attr_in2_input.attr,
+
+       &dev_attr_wdog_control.attr,
+       &dev_attr_wdog_preset.attr,
+       &dev_attr_wdog_state.attr,
+
+       &dev_attr_temp1_input.attr,
+       &dev_attr_temp1_status.attr,
+       &dev_attr_temp1_reset.attr,
+       &dev_attr_temp2_input.attr,
+       &dev_attr_temp2_status.attr,
+       &dev_attr_temp2_reset.attr,
+       &dev_attr_temp3_input.attr,
+       &dev_attr_temp3_status.attr,
+       &dev_attr_temp3_reset.attr,
+
+       &dev_attr_fan1_input.attr,
+       &dev_attr_fan1_status.attr,
+       &dev_attr_fan1_ripple.attr,
+       &dev_attr_pwm1.attr,
+       &dev_attr_fan2_input.attr,
+       &dev_attr_fan2_status.attr,
+       &dev_attr_fan2_ripple.attr,
+       &dev_attr_pwm2.attr,
+       &dev_attr_fan3_input.attr,
+       &dev_attr_fan3_status.attr,
+       &dev_attr_fan3_ripple.attr,
+       NULL
+};
+
+static const struct attribute_group fscpos_group = {
+       .attrs = fscpos_attributes,
+};
+
 static int fscpos_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
@@ -497,42 +535,19 @@ static int fscpos_detect(struct i2c_adapter *adapter, int address, int kind)
        dev_info(&new_client->dev, "Found fscpos chip, rev %u\n", data->revision);
 
        /* Register sysfs hooks */
-       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, &fscpos_group)))
                goto exit_detach;
-       }
 
-       device_create_file(&new_client->dev, &dev_attr_event);
-       device_create_file(&new_client->dev, &dev_attr_in0_input);
-       device_create_file(&new_client->dev, &dev_attr_in1_input);
-       device_create_file(&new_client->dev, &dev_attr_in2_input);
-       device_create_file(&new_client->dev, &dev_attr_wdog_control);
-       device_create_file(&new_client->dev, &dev_attr_wdog_preset);
-       device_create_file(&new_client->dev, &dev_attr_wdog_state);
-       device_create_file(&new_client->dev, &dev_attr_temp1_input);
-       device_create_file(&new_client->dev, &dev_attr_temp1_status);
-       device_create_file(&new_client->dev, &dev_attr_temp1_reset);
-       device_create_file(&new_client->dev, &dev_attr_temp2_input);
-       device_create_file(&new_client->dev, &dev_attr_temp2_status);
-       device_create_file(&new_client->dev, &dev_attr_temp2_reset);
-       device_create_file(&new_client->dev, &dev_attr_temp3_input);
-       device_create_file(&new_client->dev, &dev_attr_temp3_status);
-       device_create_file(&new_client->dev, &dev_attr_temp3_reset);
-       device_create_file(&new_client->dev, &dev_attr_fan1_input);
-       device_create_file(&new_client->dev, &dev_attr_fan1_status);
-       device_create_file(&new_client->dev, &dev_attr_fan1_ripple);
-       device_create_file(&new_client->dev, &dev_attr_pwm1);
-       device_create_file(&new_client->dev, &dev_attr_fan2_input);
-       device_create_file(&new_client->dev, &dev_attr_fan2_status);
-       device_create_file(&new_client->dev, &dev_attr_fan2_ripple);
-       device_create_file(&new_client->dev, &dev_attr_pwm2);
-       device_create_file(&new_client->dev, &dev_attr_fan3_input);
-       device_create_file(&new_client->dev, &dev_attr_fan3_status);
-       device_create_file(&new_client->dev, &dev_attr_fan3_ripple);
+       data->hwmon_dev = hwmon_device_register(&new_client->dev);
+       if (IS_ERR(data->hwmon_dev)) {
+               err = PTR_ERR(data->hwmon_dev);
+               goto exit_remove_files;
+       }
 
        return 0;
 
+exit_remove_files:
+       sysfs_remove_group(&new_client->dev.kobj, &fscpos_group);
 exit_detach:
        i2c_detach_client(new_client);
 exit_free:
@@ -546,7 +561,8 @@ static int fscpos_detach_client(struct i2c_client *client)
        struct fscpos_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, &fscpos_group);
 
        if ((err = i2c_detach_client(client)))
                return err;