forked from luck/tmp_suning_uos_patched
hwmon: (adt7411) Convert to use devm_ functions
Convert to use devm_ functions to reduce code size and simplify the code. Cc: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
parent
33fd2b84c9
commit
65ec17b0d5
@ -283,7 +283,7 @@ static int __devinit adt7411_probe(struct i2c_client *client,
|
||||
struct adt7411_data *data;
|
||||
int ret;
|
||||
|
||||
data = kzalloc(sizeof(*data), GFP_KERNEL);
|
||||
data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
|
||||
if (!data)
|
||||
return -ENOMEM;
|
||||
|
||||
@ -294,14 +294,14 @@ static int __devinit adt7411_probe(struct i2c_client *client,
|
||||
ret = adt7411_modify_bit(client, ADT7411_REG_CFG1,
|
||||
ADT7411_CFG1_START_MONITOR, 1);
|
||||
if (ret < 0)
|
||||
goto exit_free;
|
||||
return ret;
|
||||
|
||||
/* force update on first occasion */
|
||||
data->next_update = jiffies;
|
||||
|
||||
ret = sysfs_create_group(&client->dev.kobj, &adt7411_attr_grp);
|
||||
if (ret)
|
||||
goto exit_free;
|
||||
return ret;
|
||||
|
||||
data->hwmon_dev = hwmon_device_register(&client->dev);
|
||||
if (IS_ERR(data->hwmon_dev)) {
|
||||
@ -315,8 +315,6 @@ static int __devinit adt7411_probe(struct i2c_client *client,
|
||||
|
||||
exit_remove:
|
||||
sysfs_remove_group(&client->dev.kobj, &adt7411_attr_grp);
|
||||
exit_free:
|
||||
kfree(data);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -326,7 +324,6 @@ static int __devexit adt7411_remove(struct i2c_client *client)
|
||||
|
||||
hwmon_device_unregister(data->hwmon_dev);
|
||||
sysfs_remove_group(&client->dev.kobj, &adt7411_attr_grp);
|
||||
kfree(data);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user