diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2012-06-02 09:57:58 -0700 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2012-09-23 21:08:29 -0700 |
| commit | d5282926aa89587d78bbfeb6655500b1a72de15c (patch) | |
| tree | 1322ed9247b4fe4e19668b10ee1bcd1a5c1223fa /drivers/hwmon/ad7418.c | |
| parent | 0fee6591b7f82bb293de7949297fc8db59b31f0d (diff) | |
| download | op-kernel-dev-d5282926aa89587d78bbfeb6655500b1a72de15c.zip op-kernel-dev-d5282926aa89587d78bbfeb6655500b1a72de15c.tar.gz | |
hwmon: (ad7418) Convert to use devm_ functions
Convert to use devm_ functions to reduce code size and simplify the code.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/ad7418.c')
| -rw-r--r-- | drivers/hwmon/ad7418.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/drivers/hwmon/ad7418.c b/drivers/hwmon/ad7418.c index a50a6be..57d4a62 100644 --- a/drivers/hwmon/ad7418.c +++ b/drivers/hwmon/ad7418.c @@ -227,16 +227,13 @@ static int ad7418_probe(struct i2c_client *client, int err; if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA | - I2C_FUNC_SMBUS_WORD_DATA)) { - err = -EOPNOTSUPP; - goto exit; - } + I2C_FUNC_SMBUS_WORD_DATA)) + return -EOPNOTSUPP; - data = kzalloc(sizeof(struct ad7418_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto exit; - } + data = devm_kzalloc(&client->dev, sizeof(struct ad7418_data), + GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(client, data); @@ -268,7 +265,7 @@ static int ad7418_probe(struct i2c_client *client, /* Register sysfs hooks */ err = sysfs_create_group(&client->dev.kobj, &data->attrs); if (err) - goto exit_free; + return err; data->hwmon_dev = hwmon_device_register(&client->dev); if (IS_ERR(data->hwmon_dev)) { @@ -280,9 +277,6 @@ static int ad7418_probe(struct i2c_client *client, exit_remove: sysfs_remove_group(&client->dev.kobj, &data->attrs); -exit_free: - kfree(data); -exit: return err; } @@ -291,7 +285,6 @@ static int ad7418_remove(struct i2c_client *client) struct ad7418_data *data = i2c_get_clientdata(client); hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, &data->attrs); - kfree(data); return 0; } |
