aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2012-06-02 12:58:03 -0400
committerGuenter Roeck <linux@roeck-us.net>2012-07-22 00:48:39 -0400
commite20b4b38cdf1622d1577ae5e402ded2bd63bf616 (patch)
tree818cad2ef7a91392b2e94705049e0bd754afb4c0
parentd466a353052582ea784d9f5352c822d828d00244 (diff)
hwmon: (ds1621) Convert to use devm_ functions
Convert to use devm_ functions to reduce code size and simplify the code. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Jean Delvare <khali@linux-fr.org>
-rw-r--r--drivers/hwmon/ds1621.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index f647a3307ebc..1c568736baff 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -249,11 +249,10 @@ static int ds1621_probe(struct i2c_client *client,
249 struct ds1621_data *data; 249 struct ds1621_data *data;
250 int err; 250 int err;
251 251
252 data = kzalloc(sizeof(struct ds1621_data), GFP_KERNEL); 252 data = devm_kzalloc(&client->dev, sizeof(struct ds1621_data),
253 if (!data) { 253 GFP_KERNEL);
254 err = -ENOMEM; 254 if (!data)
255 goto exit; 255 return -ENOMEM;
256 }
257 256
258 i2c_set_clientdata(client, data); 257 i2c_set_clientdata(client, data);
259 mutex_init(&data->update_lock); 258 mutex_init(&data->update_lock);
@@ -264,7 +263,7 @@ static int ds1621_probe(struct i2c_client *client,
264 /* Register sysfs hooks */ 263 /* Register sysfs hooks */
265 err = sysfs_create_group(&client->dev.kobj, &ds1621_group); 264 err = sysfs_create_group(&client->dev.kobj, &ds1621_group);
266 if (err) 265 if (err)
267 goto exit_free; 266 return err;
268 267
269 data->hwmon_dev = hwmon_device_register(&client->dev); 268 data->hwmon_dev = hwmon_device_register(&client->dev);
270 if (IS_ERR(data->hwmon_dev)) { 269 if (IS_ERR(data->hwmon_dev)) {
@@ -276,9 +275,6 @@ static int ds1621_probe(struct i2c_client *client,
276 275
277 exit_remove_files: 276 exit_remove_files:
278 sysfs_remove_group(&client->dev.kobj, &ds1621_group); 277 sysfs_remove_group(&client->dev.kobj, &ds1621_group);
279 exit_free:
280 kfree(data);
281 exit:
282 return err; 278 return err;
283} 279}
284 280
@@ -289,8 +285,6 @@ static int ds1621_remove(struct i2c_client *client)
289 hwmon_device_unregister(data->hwmon_dev); 285 hwmon_device_unregister(data->hwmon_dev);
290 sysfs_remove_group(&client->dev.kobj, &ds1621_group); 286 sysfs_remove_group(&client->dev.kobj, &ds1621_group);
291 287
292 kfree(data);
293
294 return 0; 288 return 0;
295} 289}
296 290