diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-06-02 12:58:03 -0400 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-09-24 00:08:31 -0400 |
| commit | 3aa9d1df7e7abc91fb11bff41f389f3fc7b39eee (patch) | |
| tree | 8d0ae9a8fe06d1d876c671572a7bf040012474f3 /drivers/hwmon/ds620.c | |
| parent | 805fd8c5b8868036e1e1298fcccf7499f6d6ede2 (diff) | |
hwmon: (ds620) 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>
Diffstat (limited to 'drivers/hwmon/ds620.c')
| -rw-r--r-- | drivers/hwmon/ds620.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/hwmon/ds620.c b/drivers/hwmon/ds620.c index 50663efad412..f1d6b422cf06 100644 --- a/drivers/hwmon/ds620.c +++ b/drivers/hwmon/ds620.c | |||
| @@ -232,11 +232,10 @@ static int ds620_probe(struct i2c_client *client, | |||
| 232 | struct ds620_data *data; | 232 | struct ds620_data *data; |
| 233 | int err; | 233 | int err; |
| 234 | 234 | ||
| 235 | data = kzalloc(sizeof(struct ds620_data), GFP_KERNEL); | 235 | data = devm_kzalloc(&client->dev, sizeof(struct ds620_data), |
| 236 | if (!data) { | 236 | GFP_KERNEL); |
| 237 | err = -ENOMEM; | 237 | if (!data) |
| 238 | goto exit; | 238 | return -ENOMEM; |
| 239 | } | ||
| 240 | 239 | ||
| 241 | i2c_set_clientdata(client, data); | 240 | i2c_set_clientdata(client, data); |
| 242 | mutex_init(&data->update_lock); | 241 | mutex_init(&data->update_lock); |
| @@ -247,7 +246,7 @@ static int ds620_probe(struct i2c_client *client, | |||
| 247 | /* Register sysfs hooks */ | 246 | /* Register sysfs hooks */ |
| 248 | err = sysfs_create_group(&client->dev.kobj, &ds620_group); | 247 | err = sysfs_create_group(&client->dev.kobj, &ds620_group); |
| 249 | if (err) | 248 | if (err) |
| 250 | goto exit_free; | 249 | return err; |
| 251 | 250 | ||
| 252 | data->hwmon_dev = hwmon_device_register(&client->dev); | 251 | data->hwmon_dev = hwmon_device_register(&client->dev); |
| 253 | if (IS_ERR(data->hwmon_dev)) { | 252 | if (IS_ERR(data->hwmon_dev)) { |
| @@ -261,9 +260,6 @@ static int ds620_probe(struct i2c_client *client, | |||
| 261 | 260 | ||
| 262 | exit_remove_files: | 261 | exit_remove_files: |
| 263 | sysfs_remove_group(&client->dev.kobj, &ds620_group); | 262 | sysfs_remove_group(&client->dev.kobj, &ds620_group); |
| 264 | exit_free: | ||
| 265 | kfree(data); | ||
| 266 | exit: | ||
| 267 | return err; | 263 | return err; |
| 268 | } | 264 | } |
| 269 | 265 | ||
| @@ -274,8 +270,6 @@ static int ds620_remove(struct i2c_client *client) | |||
| 274 | hwmon_device_unregister(data->hwmon_dev); | 270 | hwmon_device_unregister(data->hwmon_dev); |
| 275 | sysfs_remove_group(&client->dev.kobj, &ds620_group); | 271 | sysfs_remove_group(&client->dev.kobj, &ds620_group); |
| 276 | 272 | ||
| 277 | kfree(data); | ||
| 278 | |||
| 279 | return 0; | 273 | return 0; |
| 280 | } | 274 | } |
| 281 | 275 | ||