X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fhwmon%2Flm77.c;fp=drivers%2Fhwmon%2Flm77.c;h=f82acf67acf54c7180a35cd45b263615fc87a024;hb=52714c04df4b12ca308a1d792d50681df43365c2;hp=3ccc23a0c7f5a715b78a3d898bf395790f572690;hpb=efd2d117aeb5f01cc9c90e56fff29d4a5f535580;p=~andy%2Flinux diff --git a/drivers/hwmon/lm77.c b/drivers/hwmon/lm77.c index 3ccc23a0c7f..f82acf67acf 100644 --- a/drivers/hwmon/lm77.c +++ b/drivers/hwmon/lm77.c @@ -343,11 +343,9 @@ static int lm77_probe(struct i2c_client *client, const struct i2c_device_id *id) struct lm77_data *data; int err; - data = kzalloc(sizeof(struct lm77_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto exit; - } + data = devm_kzalloc(dev, sizeof(struct lm77_data), GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(client, data); data->valid = 0; @@ -359,7 +357,7 @@ static int lm77_probe(struct i2c_client *client, const struct i2c_device_id *id) /* Register sysfs hooks */ err = sysfs_create_group(&dev->kobj, &lm77_group); if (err) - goto exit_free; + return err; data->hwmon_dev = hwmon_device_register(dev); if (IS_ERR(data->hwmon_dev)) { @@ -371,9 +369,6 @@ static int lm77_probe(struct i2c_client *client, const struct i2c_device_id *id) exit_remove: sysfs_remove_group(&dev->kobj, &lm77_group); -exit_free: - kfree(data); -exit: return err; } @@ -382,7 +377,6 @@ static int lm77_remove(struct i2c_client *client) struct lm77_data *data = i2c_get_clientdata(client); hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, &lm77_group); - kfree(data); return 0; }