Skip to content

Commit

Permalink
hwmon: (ltc4245) Convert to use devm_ functions
Browse files Browse the repository at this point in the history
Convert to use devm_ functions to reduce code size and simplify the code.

Cc: Ira W. Snyder <iws@ovro.caltech.edu>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
  • Loading branch information
Guenter Roeck committed Sep 24, 2012
1 parent d2b95e5 commit effb8ab
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions drivers/hwmon/ltc4245.c
Original file line number Diff line number Diff line change
Expand Up @@ -519,11 +519,9 @@ static int ltc4245_probe(struct i2c_client *client,
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
return -ENODEV;

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

i2c_set_clientdata(client, data);
mutex_init(&data->update_lock);
Expand All @@ -536,7 +534,7 @@ static int ltc4245_probe(struct i2c_client *client,
/* Register sysfs hooks */
ret = ltc4245_sysfs_create_groups(client);
if (ret)
goto out_sysfs_create_groups;
return ret;

data->hwmon_dev = hwmon_device_register(&client->dev);
if (IS_ERR(data->hwmon_dev)) {
Expand All @@ -548,9 +546,6 @@ static int ltc4245_probe(struct i2c_client *client,

out_hwmon_device_register:
ltc4245_sysfs_remove_groups(client);
out_sysfs_create_groups:
kfree(data);
out_kzalloc:
return ret;
}

Expand All @@ -560,7 +555,6 @@ static int ltc4245_remove(struct i2c_client *client)

hwmon_device_unregister(data->hwmon_dev);
ltc4245_sysfs_remove_groups(client);
kfree(data);

return 0;
}
Expand Down

0 comments on commit effb8ab

Please sign in to comment.