Commit bba636d0 authored by Guenter Roeck's avatar Guenter Roeck

hwmon: (gl518sm) Convert to use devm_ functions

Convert to use devm_ functions to reduce code size and simplify the code.
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
parent 6ecffe16
...@@ -544,11 +544,10 @@ static int gl518_probe(struct i2c_client *client, ...@@ -544,11 +544,10 @@ static int gl518_probe(struct i2c_client *client,
struct gl518_data *data; struct gl518_data *data;
int err, revision; int err, revision;
data = kzalloc(sizeof(struct gl518_data), GFP_KERNEL); data = devm_kzalloc(&client->dev, sizeof(struct gl518_data),
if (!data) { GFP_KERNEL);
err = -ENOMEM; if (!data)
goto exit; return -ENOMEM;
}
i2c_set_clientdata(client, data); i2c_set_clientdata(client, data);
revision = gl518_read_value(client, GL518_REG_REVISION); revision = gl518_read_value(client, GL518_REG_REVISION);
...@@ -562,7 +561,7 @@ static int gl518_probe(struct i2c_client *client, ...@@ -562,7 +561,7 @@ static int gl518_probe(struct i2c_client *client,
/* Register sysfs hooks */ /* Register sysfs hooks */
err = sysfs_create_group(&client->dev.kobj, &gl518_group); err = sysfs_create_group(&client->dev.kobj, &gl518_group);
if (err) if (err)
goto exit_free; return err;
if (data->type == gl518sm_r80) { if (data->type == gl518sm_r80) {
err = sysfs_create_group(&client->dev.kobj, &gl518_group_r80); err = sysfs_create_group(&client->dev.kobj, &gl518_group_r80);
if (err) if (err)
...@@ -581,9 +580,6 @@ static int gl518_probe(struct i2c_client *client, ...@@ -581,9 +580,6 @@ static int gl518_probe(struct i2c_client *client,
sysfs_remove_group(&client->dev.kobj, &gl518_group); sysfs_remove_group(&client->dev.kobj, &gl518_group);
if (data->type == gl518sm_r80) if (data->type == gl518sm_r80)
sysfs_remove_group(&client->dev.kobj, &gl518_group_r80); sysfs_remove_group(&client->dev.kobj, &gl518_group_r80);
exit_free:
kfree(data);
exit:
return err; return err;
} }
...@@ -617,7 +613,6 @@ static int gl518_remove(struct i2c_client *client) ...@@ -617,7 +613,6 @@ static int gl518_remove(struct i2c_client *client)
if (data->type == gl518sm_r80) if (data->type == gl518sm_r80)
sysfs_remove_group(&client->dev.kobj, &gl518_group_r80); sysfs_remove_group(&client->dev.kobj, &gl518_group_r80);
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