From e91c37ccdc827b54eb857ab08ea2fac4e7b7d9f8 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sat, 2 Jun 2012 10:35:52 -0700 Subject: [PATCH] --- yaml --- r: 326176 b: refs/heads/master c: 78968642cc4b57c37d18b0242643026abc92717b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/ltc4151.c | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 3c9afb229cf9..a132cdfba84d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7008b9704ada3d7483358da7a3c7c640e1e0be17 +refs/heads/master: 78968642cc4b57c37d18b0242643026abc92717b diff --git a/trunk/drivers/hwmon/ltc4151.c b/trunk/drivers/hwmon/ltc4151.c index 4d005b219de2..8496baa08bc8 100644 --- a/trunk/drivers/hwmon/ltc4151.c +++ b/trunk/drivers/hwmon/ltc4151.c @@ -181,11 +181,9 @@ static int ltc4151_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); @@ -193,7 +191,7 @@ static int ltc4151_probe(struct i2c_client *client, /* Register sysfs hooks */ ret = sysfs_create_group(&client->dev.kobj, <c4151_group); if (ret) - goto out_sysfs_create_group; + return ret; data->hwmon_dev = hwmon_device_register(&client->dev); if (IS_ERR(data->hwmon_dev)) { @@ -205,9 +203,6 @@ static int ltc4151_probe(struct i2c_client *client, out_hwmon_device_register: sysfs_remove_group(&client->dev.kobj, <c4151_group); -out_sysfs_create_group: - kfree(data); -out_kzalloc: return ret; } @@ -218,8 +213,6 @@ static int ltc4151_remove(struct i2c_client *client) hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, <c4151_group); - kfree(data); - return 0; }