]> git.karo-electronics.de Git - linux-beck.git/commitdiff
hwmon: (smm665) Convert to use devm_kzalloc
authorGuenter Roeck <linux@roeck-us.net>
Wed, 22 Feb 2012 16:56:48 +0000 (08:56 -0800)
committerGuenter Roeck <guenter.roeck@ericsson.com>
Mon, 19 Mar 2012 01:27:47 +0000 (18:27 -0700)
Marginally less code and eliminate the possibility of memory leaks.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/smm665.c

index 5877078aaca58aca0ed62b5e6e10e6df9b8cfc64..cbc51fb30dba12f0c217cd038386f21aa7be52ba 100644 (file)
@@ -584,10 +584,9 @@ static int smm665_probe(struct i2c_client *client,
        if (i2c_smbus_read_byte_data(client, SMM665_ADOC_ENABLE) < 0)
                return -ENODEV;
 
-       ret = -ENOMEM;
-       data = kzalloc(sizeof(*data), GFP_KERNEL);
+       data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
        if (!data)
-               goto out_return;
+               return -ENOMEM;
 
        i2c_set_clientdata(client, data);
        mutex_init(&data->update_lock);
@@ -596,7 +595,7 @@ static int smm665_probe(struct i2c_client *client,
        data->cmdreg = i2c_new_dummy(adapter, (client->addr & ~SMM665_REGMASK)
                                     | SMM665_CMDREG_BASE);
        if (!data->cmdreg)
-               goto out_kfree;
+               return -ENOMEM;
 
        switch (data->type) {
        case smm465:
@@ -679,9 +678,6 @@ out_remove_group:
        sysfs_remove_group(&client->dev.kobj, &smm665_group);
 out_unregister:
        i2c_unregister_device(data->cmdreg);
-out_kfree:
-       kfree(data);
-out_return:
        return ret;
 }
 
@@ -693,8 +689,6 @@ static int smm665_remove(struct i2c_client *client)
        hwmon_device_unregister(data->hwmon_dev);
        sysfs_remove_group(&client->dev.kobj, &smm665_group);
 
-       kfree(data);
-
        return 0;
 }