mfd: max8998: Use devm_*() functions
authorJingoo Han <jg1.han@samsung.com>
Tue, 20 Aug 2013 07:04:42 +0000 (16:04 +0900)
committerLee Jones <lee.jones@linaro.org>
Tue, 20 Aug 2013 07:51:23 +0000 (08:51 +0100)
Use devm_*() functions to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/max8998.c

index 45bffb8..fe6332d 100644 (file)
@@ -188,7 +188,8 @@ static int max8998_i2c_probe(struct i2c_client *i2c,
        struct max8998_dev *max8998;
        int ret = 0;
 
-       max8998 = kzalloc(sizeof(struct max8998_dev), GFP_KERNEL);
+       max8998 = devm_kzalloc(&i2c->dev, sizeof(struct max8998_dev),
+                               GFP_KERNEL);
        if (max8998 == NULL)
                return -ENOMEM;
 
@@ -246,7 +247,6 @@ err:
        mfd_remove_devices(max8998->dev);
        max8998_irq_exit(max8998);
        i2c_unregister_device(max8998->rtc);
-       kfree(max8998);
        return ret;
 }
 
@@ -257,7 +257,6 @@ static int max8998_i2c_remove(struct i2c_client *i2c)
        mfd_remove_devices(max8998->dev);
        max8998_irq_exit(max8998);
        i2c_unregister_device(max8998->rtc);
-       kfree(max8998);
 
        return 0;
 }