Commit 198b8611 authored by Sachin Kamat's avatar Sachin Kamat Committed by Bryan Wu

leds: Use devm_kzalloc in leds-gpio.c file

devm_kzalloc() makes cleanup simpler.
Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarBryan Wu <bryan.wu@canonical.com>
parent 7f13bbf7
...@@ -178,7 +178,8 @@ static struct gpio_leds_priv * __devinit gpio_leds_create_of(struct platform_dev ...@@ -178,7 +178,8 @@ static struct gpio_leds_priv * __devinit gpio_leds_create_of(struct platform_dev
if (!count) if (!count)
return NULL; 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) if (!priv)
return NULL; return NULL;
...@@ -215,7 +216,6 @@ static struct gpio_leds_priv * __devinit gpio_leds_create_of(struct platform_dev ...@@ -215,7 +216,6 @@ static struct gpio_leds_priv * __devinit gpio_leds_create_of(struct platform_dev
err: err:
for (count = priv->num_leds - 2; count >= 0; count--) for (count = priv->num_leds - 2; count >= 0; count--)
delete_gpio_led(&priv->leds[count]); delete_gpio_led(&priv->leds[count]);
kfree(priv);
return NULL; return NULL;
} }
...@@ -239,7 +239,8 @@ static int __devinit gpio_led_probe(struct platform_device *pdev) ...@@ -239,7 +239,8 @@ static int __devinit gpio_led_probe(struct platform_device *pdev)
int i, ret = 0; int i, ret = 0;
if (pdata && pdata->num_leds) { if (pdata && pdata->num_leds) {
priv = kzalloc(sizeof_gpio_leds_priv(pdata->num_leds), priv = devm_kzalloc(&pdev->dev,
sizeof_gpio_leds_priv(pdata->num_leds),
GFP_KERNEL); GFP_KERNEL);
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
...@@ -253,7 +254,6 @@ static int __devinit gpio_led_probe(struct platform_device *pdev) ...@@ -253,7 +254,6 @@ static int __devinit gpio_led_probe(struct platform_device *pdev)
/* On failure: unwind the led creations */ /* On failure: unwind the led creations */
for (i = i - 1; i >= 0; i--) for (i = i - 1; i >= 0; i--)
delete_gpio_led(&priv->leds[i]); delete_gpio_led(&priv->leds[i]);
kfree(priv);
return ret; return ret;
} }
} }
...@@ -277,7 +277,6 @@ static int __devexit gpio_led_remove(struct platform_device *pdev) ...@@ -277,7 +277,6 @@ static int __devexit gpio_led_remove(struct platform_device *pdev)
delete_gpio_led(&priv->leds[i]); delete_gpio_led(&priv->leds[i]);
dev_set_drvdata(&pdev->dev, NULL); dev_set_drvdata(&pdev->dev, NULL);
kfree(priv);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment