hwmon: (lineage-pem) Convert to use devm_kzalloc
authorGuenter Roeck <linux@roeck-us.net>
Wed, 22 Feb 2012 16:56:45 +0000 (08:56 -0800)
committerGuenter Roeck <guenter.roeck@ericsson.com>
Mon, 19 Mar 2012 01:27:44 +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/lineage-pem.c

index 5b8c9aeed3d64c6bed672ffeb754e14f3e11255e..d264937c7f5e09f8fa9c2cf453d6c4e4b37bb3bf 100644 (file)
@@ -448,7 +448,7 @@ static int pem_probe(struct i2c_client *client,
                                     | I2C_FUNC_SMBUS_WRITE_BYTE))
                return -ENODEV;
 
-       data = kzalloc(sizeof(*data), GFP_KERNEL);
+       data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
        if (!data)
                return -ENOMEM;
 
@@ -462,11 +462,11 @@ static int pem_probe(struct i2c_client *client,
        ret = pem_read_block(client, PEM_READ_FIRMWARE_REV,
                             data->firmware_rev, sizeof(data->firmware_rev));
        if (ret < 0)
-               goto out_kfree;
+               return ret;
 
        ret = i2c_smbus_write_byte(client, PEM_CLEAR_INFO_FLAGS);
        if (ret < 0)
-               goto out_kfree;
+               return ret;
 
        dev_info(&client->dev, "Firmware revision %d.%d.%d\n",
                 data->firmware_rev[0], data->firmware_rev[1],
@@ -475,7 +475,7 @@ static int pem_probe(struct i2c_client *client,
        /* Register sysfs hooks */
        ret = sysfs_create_group(&client->dev.kobj, &pem_group);
        if (ret)
-               goto out_kfree;
+               return ret;
 
        /*
         * Check if input readings are supported.
@@ -534,8 +534,6 @@ out_remove_groups:
        sysfs_remove_group(&client->dev.kobj, &pem_input_group);
        sysfs_remove_group(&client->dev.kobj, &pem_fan_group);
        sysfs_remove_group(&client->dev.kobj, &pem_group);
-out_kfree:
-       kfree(data);
        return ret;
 }
 
@@ -549,7 +547,6 @@ static int pem_remove(struct i2c_client *client)
        sysfs_remove_group(&client->dev.kobj, &pem_fan_group);
        sysfs_remove_group(&client->dev.kobj, &pem_group);
 
-       kfree(data);
        return 0;
 }