diff options
author | Guenter Roeck <linux@roeck-us.net> | 2012-02-22 11:56:49 -0500 |
---|---|---|
committer | Guenter Roeck <guenter.roeck@ericsson.com> | 2012-03-18 21:27:46 -0400 |
commit | 36839287204f1c419907d3873f1e45062000e8a2 (patch) | |
tree | 791547e087f072914199dcc93862b1bb144348f6 /drivers/hwmon/ltc4261.c | |
parent | dd285ad7373bf5d21cceacb3b7a5eb8b72d37085 (diff) |
hwmon: (ltc4261) Convert to use devm_kzalloc
Marginally less code and eliminate the possibility of memory leaks.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/ltc4261.c')
-rw-r--r-- | drivers/hwmon/ltc4261.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/hwmon/ltc4261.c b/drivers/hwmon/ltc4261.c index ab1bfbf2a3f0..069b7d34d8f9 100644 --- a/drivers/hwmon/ltc4261.c +++ b/drivers/hwmon/ltc4261.c | |||
@@ -235,11 +235,9 @@ static int ltc4261_probe(struct i2c_client *client, | |||
235 | return -ENODEV; | 235 | return -ENODEV; |
236 | } | 236 | } |
237 | 237 | ||
238 | data = kzalloc(sizeof(*data), GFP_KERNEL); | 238 | data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL); |
239 | if (!data) { | 239 | if (!data) |
240 | ret = -ENOMEM; | 240 | return -ENOMEM; |
241 | goto out_kzalloc; | ||
242 | } | ||
243 | 241 | ||
244 | i2c_set_clientdata(client, data); | 242 | i2c_set_clientdata(client, data); |
245 | mutex_init(&data->update_lock); | 243 | mutex_init(&data->update_lock); |
@@ -250,7 +248,7 @@ static int ltc4261_probe(struct i2c_client *client, | |||
250 | /* Register sysfs hooks */ | 248 | /* Register sysfs hooks */ |
251 | ret = sysfs_create_group(&client->dev.kobj, <c4261_group); | 249 | ret = sysfs_create_group(&client->dev.kobj, <c4261_group); |
252 | if (ret) | 250 | if (ret) |
253 | goto out_sysfs_create_group; | 251 | return ret; |
254 | 252 | ||
255 | data->hwmon_dev = hwmon_device_register(&client->dev); | 253 | data->hwmon_dev = hwmon_device_register(&client->dev); |
256 | if (IS_ERR(data->hwmon_dev)) { | 254 | if (IS_ERR(data->hwmon_dev)) { |
@@ -262,9 +260,6 @@ static int ltc4261_probe(struct i2c_client *client, | |||
262 | 260 | ||
263 | out_hwmon_device_register: | 261 | out_hwmon_device_register: |
264 | sysfs_remove_group(&client->dev.kobj, <c4261_group); | 262 | sysfs_remove_group(&client->dev.kobj, <c4261_group); |
265 | out_sysfs_create_group: | ||
266 | kfree(data); | ||
267 | out_kzalloc: | ||
268 | return ret; | 263 | return ret; |
269 | } | 264 | } |
270 | 265 | ||
@@ -275,8 +270,6 @@ static int ltc4261_remove(struct i2c_client *client) | |||
275 | hwmon_device_unregister(data->hwmon_dev); | 270 | hwmon_device_unregister(data->hwmon_dev); |
276 | sysfs_remove_group(&client->dev.kobj, <c4261_group); | 271 | sysfs_remove_group(&client->dev.kobj, <c4261_group); |
277 | 272 | ||
278 | kfree(data); | ||
279 | |||
280 | return 0; | 273 | return 0; |
281 | } | 274 | } |
282 | 275 | ||