Commit 4a8ad25a authored by Guenter Roeck's avatar Guenter Roeck

hwmon: (lm93) 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 705375cc
...@@ -2738,15 +2738,13 @@ static int lm93_probe(struct i2c_client *client, ...@@ -2738,15 +2738,13 @@ static int lm93_probe(struct i2c_client *client,
} else { } else {
dev_dbg(&client->dev, "detect failed, " dev_dbg(&client->dev, "detect failed, "
"smbus byte and/or word data not supported!\n"); "smbus byte and/or word data not supported!\n");
err = -ENODEV; return -ENODEV;
goto err_out;
} }
data = kzalloc(sizeof(struct lm93_data), GFP_KERNEL); data = devm_kzalloc(&client->dev, sizeof(struct lm93_data), GFP_KERNEL);
if (!data) { if (!data) {
dev_dbg(&client->dev, "out of memory!\n"); dev_dbg(&client->dev, "out of memory!\n");
err = -ENOMEM; return -ENOMEM;
goto err_out;
} }
i2c_set_clientdata(client, data); i2c_set_clientdata(client, data);
...@@ -2760,7 +2758,7 @@ static int lm93_probe(struct i2c_client *client, ...@@ -2760,7 +2758,7 @@ static int lm93_probe(struct i2c_client *client,
err = sysfs_create_group(&client->dev.kobj, &lm93_attr_grp); err = sysfs_create_group(&client->dev.kobj, &lm93_attr_grp);
if (err) if (err)
goto err_free; return err;
/* Register hwmon driver class */ /* Register hwmon driver class */
data->hwmon_dev = hwmon_device_register(&client->dev); data->hwmon_dev = hwmon_device_register(&client->dev);
...@@ -2770,9 +2768,6 @@ static int lm93_probe(struct i2c_client *client, ...@@ -2770,9 +2768,6 @@ static int lm93_probe(struct i2c_client *client,
err = PTR_ERR(data->hwmon_dev); err = PTR_ERR(data->hwmon_dev);
dev_err(&client->dev, "error registering hwmon device.\n"); dev_err(&client->dev, "error registering hwmon device.\n");
sysfs_remove_group(&client->dev.kobj, &lm93_attr_grp); sysfs_remove_group(&client->dev.kobj, &lm93_attr_grp);
err_free:
kfree(data);
err_out:
return err; return err;
} }
...@@ -2783,7 +2778,6 @@ static int lm93_remove(struct i2c_client *client) ...@@ -2783,7 +2778,6 @@ static int lm93_remove(struct i2c_client *client)
hwmon_device_unregister(data->hwmon_dev); hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&client->dev.kobj, &lm93_attr_grp); sysfs_remove_group(&client->dev.kobj, &lm93_attr_grp);
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