backlight: adp8870: use devm_ functions

The devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_kzalloc of these functions.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/video/backlight/adp8870_bl.c b/drivers/video/backlight/adp8870_bl.c
index c90539bb429fba3ba0f42910789268bb0045bfff..edf7f91c8e612e7da24aa6d313cd67ff56cf9dbc 100644 (file)
--- a/drivers/video/backlight/adp8870_bl.c
+++ b/drivers/video/backlight/adp8870_bl.c
@@ -244,8 +244,8 @@ static int __devinit adp8870_led_probe(struct i2c_client *client)
        struct led_info *cur_led;
        int ret, i;
 
-
-       led = kcalloc(pdata->num_leds, sizeof(*led), GFP_KERNEL);
+       led = devm_kzalloc(&client->dev, pdata->num_leds * sizeof(*led),
+                               GFP_KERNEL);
        if (led == NULL) {
                dev_err(&client->dev, "failed to alloc memory\n");
                return -ENOMEM;
@@ -253,17 +253,17 @@ static int __devinit adp8870_led_probe(struct i2c_client *client)
 
        ret = adp8870_write(client, ADP8870_ISCLAW, pdata->led_fade_law);
        if (ret)
-               goto err_free;
+               return ret;
 
        ret = adp8870_write(client, ADP8870_ISCT1,
                        (pdata->led_on_time & 0x3) << 6);
        if (ret)
-               goto err_free;
+               return ret;
 
        ret = adp8870_write(client, ADP8870_ISCF,
                        FADE_VAL(pdata->led_fade_in, pdata->led_fade_out));
        if (ret)
-               goto err_free;
+               return ret;
 
        for (i = 0; i < pdata->num_leds; ++i) {
                cur_led = &pdata->leds[i];
@@ -317,9 +317,6 @@ static int __devinit adp8870_led_probe(struct i2c_client *client)
                cancel_work_sync(&led[i].work);
        }
 
- err_free:
-       kfree(led);
-
        return ret;
 }
 
@@ -335,7 +332,6 @@ static int __devexit adp8870_led_remove(struct i2c_client *client)
                cancel_work_sync(&data->led[i].work);
        }
 
-       kfree(data->led);
        return 0;
 }
 #else
@@ -874,7 +870,7 @@ static int __devinit adp8870_probe(struct i2c_client *client,
                return -ENODEV;
        }
 
-       data = kzalloc(sizeof(*data), GFP_KERNEL);
+       data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
        if (data == NULL)
                return -ENOMEM;
 
@@ -894,8 +890,7 @@ static int __devinit adp8870_probe(struct i2c_client *client,
                        &client->dev, data, &adp8870_bl_ops, &props);
        if (IS_ERR(bl)) {
                dev_err(&client->dev, "failed to register backlight\n");
-               ret = PTR_ERR(bl);
-               goto out2;
+               return PTR_ERR(bl);
        }
 
        data->bl = bl;
@@ -930,8 +925,6 @@ out:
                        &adp8870_bl_attr_group);
 out1:
        backlight_device_unregister(bl);
-out2:
-       kfree(data);
 
        return ret;
 }
@@ -950,7 +943,6 @@ static int __devexit adp8870_remove(struct i2c_client *client)
                        &adp8870_bl_attr_group);
 
        backlight_device_unregister(data->bl);
-       kfree(data);
 
        return 0;
 }