libceph: move r_reply_op_{len,result} into struct ceph_osd_req_op

[linux-2.6-block.git] / drivers / hwmon / lm90.c

diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 701e952ae52378477d34c84afd99ce4ebb0e1df1..c9ff08dbe10cefcf8731c1360370edd037307d43 100644 (file)
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -365,7 +365,9 @@ enum lm90_temp11_reg_index {
  */
 
 struct lm90_data {
+       struct i2c_client *client;
        struct device *hwmon_dev;
+       const struct attribute_group *groups[6];
        struct mutex update_lock;
        struct regulator *regulator;
        char valid; /* zero until following fields are valid */
@@ -513,8 +515,8 @@ static void lm90_set_convrate(struct i2c_client *client, struct lm90_data *data,
 
 static struct lm90_data *lm90_update_device(struct device *dev)
 {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct lm90_data *data = i2c_get_clientdata(client);
+       struct lm90_data *data = dev_get_drvdata(dev);
+       struct i2c_client *client = data->client;
        unsigned long next_update;
 
        mutex_lock(&data->update_lock);
@@ -793,8 +795,8 @@ static ssize_t set_temp8(struct device *dev, struct device_attribute *devattr,
        };
 
        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
-       struct i2c_client *client = to_i2c_client(dev);
-       struct lm90_data *data = i2c_get_clientdata(client);
+       struct lm90_data *data = dev_get_drvdata(dev);
+       struct i2c_client *client = data->client;
        int nr = attr->index;
        long val;
        int err;
@@ -860,8 +862,8 @@ static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,
        };
 
        struct sensor_device_attribute_2 *attr = to_sensor_dev_attr_2(devattr);
-       struct i2c_client *client = to_i2c_client(dev);
-       struct lm90_data *data = i2c_get_clientdata(client);
+       struct lm90_data *data = dev_get_drvdata(dev);
+       struct i2c_client *client = data->client;
        int nr = attr->nr;
        int index = attr->index;
        long val;
@@ -922,8 +924,8 @@ static ssize_t show_temphyst(struct device *dev,
 static ssize_t set_temphyst(struct device *dev, struct device_attribute *dummy,
                            const char *buf, size_t count)
 {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct lm90_data *data = i2c_get_clientdata(client);
+       struct lm90_data *data = dev_get_drvdata(dev);
+       struct i2c_client *client = data->client;
        long val;
        int err;
        int temp;
@@ -976,8 +978,8 @@ static ssize_t set_update_interval(struct device *dev,
                                   struct device_attribute *attr,
                                   const char *buf, size_t count)
 {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct lm90_data *data = i2c_get_clientdata(client);
+       struct lm90_data *data = dev_get_drvdata(dev);
+       struct i2c_client *client = data->client;
        unsigned long val;
        int err;
 
@@ -1057,6 +1059,15 @@ static const struct attribute_group lm90_group = {
        .attrs = lm90_attributes,
 };
 
+static struct attribute *lm90_temp2_offset_attributes[] = {
+       &sensor_dev_attr_temp2_offset.dev_attr.attr,
+       NULL
+};
+
+static const struct attribute_group lm90_temp2_offset_group = {
+       .attrs = lm90_temp2_offset_attributes,
+};
+
 /*
  * Additional attributes for devices with emergency sensors
  */
@@ -1393,22 +1404,6 @@ static int lm90_detect(struct i2c_client *client,
        return 0;
 }
 
-static void lm90_remove_files(struct i2c_client *client, struct lm90_data *data)
-{
-       struct device *dev = &client->dev;
-
-       if (data->flags & LM90_HAVE_TEMP3)
-               sysfs_remove_group(&dev->kobj, &lm90_temp3_group);
-       if (data->flags & LM90_HAVE_EMERGENCY_ALARM)
-               sysfs_remove_group(&dev->kobj, &lm90_emergency_alarm_group);
-       if (data->flags & LM90_HAVE_EMERGENCY)
-               sysfs_remove_group(&dev->kobj, &lm90_emergency_group);
-       if (data->flags & LM90_HAVE_OFFSET)
-               device_remove_file(dev, &sensor_dev_attr_temp2_offset.dev_attr);
-       device_remove_file(dev, &dev_attr_pec);
-       sysfs_remove_group(&dev->kobj, &lm90_group);
-}
-
 static void lm90_restore_conf(struct i2c_client *client, struct lm90_data *data)
 {
        /* Restore initial configuration */
@@ -1418,10 +1413,9 @@ static void lm90_restore_conf(struct i2c_client *client, struct lm90_data *data)
                                  data->config_orig);
 }
 
-static void lm90_init_client(struct i2c_client *client)
+static void lm90_init_client(struct i2c_client *client, struct lm90_data *data)
 {
        u8 config, convrate;
-       struct lm90_data *data = i2c_get_clientdata(client);
 
        if (lm90_read_reg(client, LM90_REG_R_CONVRATE, &convrate) < 0) {
                dev_warn(&client->dev, "Failed to read convrate register!\n");
@@ -1519,6 +1513,7 @@ static int lm90_probe(struct i2c_client *client,
        struct i2c_adapter *adapter = to_i2c_adapter(dev->parent);
        struct lm90_data *data;
        struct regulator *regulator;
+       int groups = 0;
        int err;
 
        regulator = devm_regulator_get(dev, "vcc");
@@ -1527,15 +1522,15 @@ static int lm90_probe(struct i2c_client *client,
 
        err = regulator_enable(regulator);
        if (err < 0) {
-               dev_err(&client->dev,
-                       "Failed to enable regulator: %d\n", err);
+               dev_err(dev, "Failed to enable regulator: %d\n", err);
                return err;
        }
 
-       data = devm_kzalloc(&client->dev, sizeof(struct lm90_data), GFP_KERNEL);
+       data = devm_kzalloc(dev, sizeof(struct lm90_data), GFP_KERNEL);
        if (!data)
                return -ENOMEM;
 
+       data->client = client;
        i2c_set_clientdata(client, data);
        mutex_init(&data->update_lock);
 
@@ -1562,44 +1557,34 @@ static int lm90_probe(struct i2c_client *client,
        data->max_convrate = lm90_params[data->kind].max_convrate;
 
        /* Initialize the LM90 chip */
-       lm90_init_client(client);
+       lm90_init_client(client, data);
 
        /* Register sysfs hooks */
-       err = sysfs_create_group(&dev->kobj, &lm90_group);
-       if (err)
-               goto exit_restore;
+       data->groups[groups++] = &lm90_group;
+
+       if (data->flags & LM90_HAVE_OFFSET)
+               data->groups[groups++] = &lm90_temp2_offset_group;
+
+       if (data->flags & LM90_HAVE_EMERGENCY)
+               data->groups[groups++] = &lm90_emergency_group;
+
+       if (data->flags & LM90_HAVE_EMERGENCY_ALARM)
+               data->groups[groups++] = &lm90_emergency_alarm_group;
+
+       if (data->flags & LM90_HAVE_TEMP3)
+               data->groups[groups++] = &lm90_temp3_group;
+
        if (client->flags & I2C_CLIENT_PEC) {
                err = device_create_file(dev, &dev_attr_pec);
                if (err)
-                       goto exit_remove_files;
-       }
-       if (data->flags & LM90_HAVE_OFFSET) {
-               err = device_create_file(dev,
-                                       &sensor_dev_attr_temp2_offset.dev_attr);
-               if (err)
-                       goto exit_remove_files;
-       }
-       if (data->flags & LM90_HAVE_EMERGENCY) {
-               err = sysfs_create_group(&dev->kobj, &lm90_emergency_group);
-               if (err)
-                       goto exit_remove_files;
-       }
-       if (data->flags & LM90_HAVE_EMERGENCY_ALARM) {
-               err = sysfs_create_group(&dev->kobj,
-                                        &lm90_emergency_alarm_group);
-               if (err)
-                       goto exit_remove_files;
-       }
-       if (data->flags & LM90_HAVE_TEMP3) {
-               err = sysfs_create_group(&dev->kobj, &lm90_temp3_group);
-               if (err)
-                       goto exit_remove_files;
+                       goto exit_restore;
        }
 
-       data->hwmon_dev = hwmon_device_register(dev);
+       data->hwmon_dev = hwmon_device_register_with_groups(dev, client->name,
+                                                           data, data->groups);
        if (IS_ERR(data->hwmon_dev)) {
                err = PTR_ERR(data->hwmon_dev);
-               goto exit_remove_files;
+               goto exit_remove_pec;
        }
 
        if (client->irq) {
@@ -1618,8 +1603,8 @@ static int lm90_probe(struct i2c_client *client,
 
 exit_unregister:
        hwmon_device_unregister(data->hwmon_dev);
-exit_remove_files:
-       lm90_remove_files(client, data);
+exit_remove_pec:
+       device_remove_file(dev, &dev_attr_pec);
 exit_restore:
        lm90_restore_conf(client, data);
        regulator_disable(data->regulator);
@@ -1632,7 +1617,7 @@ static int lm90_remove(struct i2c_client *client)
        struct lm90_data *data = i2c_get_clientdata(client);
 
        hwmon_device_unregister(data->hwmon_dev);
-       lm90_remove_files(client, data);
+       device_remove_file(&client->dev, &dev_attr_pec);
        lm90_restore_conf(client, data);
        regulator_disable(data->regulator);