Commit 36839287 authored by Guenter Roeck's avatar Guenter Roeck Committed by Guenter Roeck

hwmon: (ltc4261) Convert to use devm_kzalloc

Marginally less code and eliminate the possibility of memory leaks.
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent dd285ad7
...@@ -235,11 +235,9 @@ static int ltc4261_probe(struct i2c_client *client, ...@@ -235,11 +235,9 @@ static int ltc4261_probe(struct i2c_client *client,
return -ENODEV; return -ENODEV;
} }
data = kzalloc(sizeof(*data), GFP_KERNEL); data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
if (!data) { if (!data)
ret = -ENOMEM; return -ENOMEM;
goto out_kzalloc;
}
i2c_set_clientdata(client, data); i2c_set_clientdata(client, data);
mutex_init(&data->update_lock); mutex_init(&data->update_lock);
...@@ -250,7 +248,7 @@ static int ltc4261_probe(struct i2c_client *client, ...@@ -250,7 +248,7 @@ static int ltc4261_probe(struct i2c_client *client,
/* Register sysfs hooks */ /* Register sysfs hooks */
ret = sysfs_create_group(&client->dev.kobj, &ltc4261_group); ret = sysfs_create_group(&client->dev.kobj, &ltc4261_group);
if (ret) if (ret)
goto out_sysfs_create_group; return ret;
data->hwmon_dev = hwmon_device_register(&client->dev); data->hwmon_dev = hwmon_device_register(&client->dev);
if (IS_ERR(data->hwmon_dev)) { if (IS_ERR(data->hwmon_dev)) {
...@@ -262,9 +260,6 @@ static int ltc4261_probe(struct i2c_client *client, ...@@ -262,9 +260,6 @@ static int ltc4261_probe(struct i2c_client *client,
out_hwmon_device_register: out_hwmon_device_register:
sysfs_remove_group(&client->dev.kobj, &ltc4261_group); sysfs_remove_group(&client->dev.kobj, &ltc4261_group);
out_sysfs_create_group:
kfree(data);
out_kzalloc:
return ret; return ret;
} }
...@@ -275,8 +270,6 @@ static int ltc4261_remove(struct i2c_client *client) ...@@ -275,8 +270,6 @@ static int ltc4261_remove(struct i2c_client *client)
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &ltc4261_group); sysfs_remove_group(&client->dev.kobj, &ltc4261_group);
kfree(data);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment