diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-06-02 10:35:52 -0700 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-09-23 21:08:32 -0700 |
| commit | d2b95e58ea28eedc126ce9b714e2c7620869fdf4 (patch) | |
| tree | 8591a60a21372d0ea4a3e9a4a1c9a94b3f6e270c | |
| parent | 78968642cc4b57c37d18b0242643026abc92717b (diff) | |
| download | blackbird-op-linux-d2b95e58ea28eedc126ce9b714e2c7620869fdf4.tar.gz blackbird-op-linux-d2b95e58ea28eedc126ce9b714e2c7620869fdf4.zip | |
hwmon: (ltc4215) Convert to use devm_ functions
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>
| -rw-r--r-- | drivers/hwmon/ltc4215.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/hwmon/ltc4215.c b/drivers/hwmon/ltc4215.c index 429c5b2b66fd..98b3d04f98b7 100644 --- a/drivers/hwmon/ltc4215.c +++ b/drivers/hwmon/ltc4215.c @@ -253,11 +253,9 @@ static int ltc4215_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); @@ -268,7 +266,7 @@ static int ltc4215_probe(struct i2c_client *client, /* Register sysfs hooks */ ret = sysfs_create_group(&client->dev.kobj, <c4215_group); if (ret) - goto out_sysfs_create_group; + return ret; data->hwmon_dev = hwmon_device_register(&client->dev); if (IS_ERR(data->hwmon_dev)) { @@ -280,9 +278,6 @@ static int ltc4215_probe(struct i2c_client *client, out_hwmon_device_register: sysfs_remove_group(&client->dev.kobj, <c4215_group); -out_sysfs_create_group: - kfree(data); -out_kzalloc: return ret; } @@ -293,8 +288,6 @@ static int ltc4215_remove(struct i2c_client *client) hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, <c4215_group); - kfree(data); - return 0; } |
