Skip to content

Commit

Permalink
hwmon: (smm665) Convert to use devm_kzalloc
Browse files Browse the repository at this point in the history
Marginally less code and eliminate the possibility of memory leaks.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
  • Loading branch information
Guenter Roeck authored and Guenter Roeck committed Mar 19, 2012
1 parent 3683928 commit b8a5a7c
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions drivers/hwmon/smm665.c
Original file line number Diff line number Diff line change
Expand Up @@ -584,10 +584,9 @@ static int smm665_probe(struct i2c_client *client,
if (i2c_smbus_read_byte_data(client, SMM665_ADOC_ENABLE) < 0)
return -ENODEV;

ret = -ENOMEM;
data = kzalloc(sizeof(*data), GFP_KERNEL);
data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
if (!data)
goto out_return;
return -ENOMEM;

i2c_set_clientdata(client, data);
mutex_init(&data->update_lock);
Expand All @@ -596,7 +595,7 @@ static int smm665_probe(struct i2c_client *client,
data->cmdreg = i2c_new_dummy(adapter, (client->addr & ~SMM665_REGMASK)
| SMM665_CMDREG_BASE);
if (!data->cmdreg)
goto out_kfree;
return -ENOMEM;

switch (data->type) {
case smm465:
Expand Down Expand Up @@ -679,9 +678,6 @@ static int smm665_probe(struct i2c_client *client,
sysfs_remove_group(&client->dev.kobj, &smm665_group);
out_unregister:
i2c_unregister_device(data->cmdreg);
out_kfree:
kfree(data);
out_return:
return ret;
}

Expand All @@ -693,8 +689,6 @@ static int smm665_remove(struct i2c_client *client)
hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &smm665_group);

kfree(data);

return 0;
}

Expand Down

0 comments on commit b8a5a7c

Please sign in to comment.