TTY: move allocations to tty_alloc_driver

[deliverable/linux.git] / drivers / leds / leds-gpio.c

diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index f4c470a3bc8dc3fa234114f691ad98656a3bef14..c032b2180340e123c3017e893185c34087fcdbde 100644 (file)
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -178,7 +178,8 @@ static struct gpio_leds_priv * __devinit gpio_leds_create_of(struct platform_dev
        if (!count)
                return NULL;
 
-       priv = kzalloc(sizeof_gpio_leds_priv(count), GFP_KERNEL);
+       priv = devm_kzalloc(&pdev->dev, sizeof_gpio_leds_priv(count),
+                       GFP_KERNEL);
        if (!priv)
                return NULL;
 
@@ -215,7 +216,6 @@ static struct gpio_leds_priv * __devinit gpio_leds_create_of(struct platform_dev
 err:
        for (count = priv->num_leds - 2; count >= 0; count--)
                delete_gpio_led(&priv->leds[count]);
-       kfree(priv);
        return NULL;
 }
 
@@ -239,8 +239,9 @@ static int __devinit gpio_led_probe(struct platform_device *pdev)
        int i, ret = 0;
 
        if (pdata && pdata->num_leds) {
-               priv = kzalloc(sizeof_gpio_leds_priv(pdata->num_leds),
-                               GFP_KERNEL);
+               priv = devm_kzalloc(&pdev->dev,
+                               sizeof_gpio_leds_priv(pdata->num_leds),
+                                       GFP_KERNEL);
                if (!priv)
                        return -ENOMEM;
 
@@ -253,7 +254,6 @@ static int __devinit gpio_led_probe(struct platform_device *pdev)
                                /* On failure: unwind the led creations */
                                for (i = i - 1; i >= 0; i--)
                                        delete_gpio_led(&priv->leds[i]);
-                               kfree(priv);
                                return ret;
                        }
                }
@@ -277,7 +277,6 @@ static int __devexit gpio_led_remove(struct platform_device *pdev)
                delete_gpio_led(&priv->leds[i]);
 
        dev_set_drvdata(&pdev->dev, NULL);
-       kfree(priv);
 
        return 0;
 }