Skip to content

Commit

Permalink
leds: convert Big Networks LED driver to devm_kzalloc()
Browse files Browse the repository at this point in the history
Cc: Simon Guinot <sguinot@lacie.com>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
  • Loading branch information
Bryan Wu committed Jul 23, 2012
1 parent 198b861 commit 8095c38
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions drivers/leds/leds-netxbig.c
Original file line number Diff line number Diff line change
Expand Up @@ -362,14 +362,14 @@ static int __devinit netxbig_led_probe(struct platform_device *pdev)
if (!pdata)
return -EINVAL;

leds_data = kzalloc(sizeof(struct netxbig_led_data) * pdata->num_leds,
GFP_KERNEL);
leds_data = devm_kzalloc(&pdev->dev,
sizeof(struct netxbig_led_data) * pdata->num_leds, GFP_KERNEL);
if (!leds_data)
return -ENOMEM;

ret = gpio_ext_init(pdata->gpio_ext);
if (ret < 0)
goto err_free_data;
return ret;

for (i = 0; i < pdata->num_leds; i++) {
ret = create_netxbig_led(pdev, &leds_data[i], &pdata->leds[i]);
Expand All @@ -386,9 +386,6 @@ static int __devinit netxbig_led_probe(struct platform_device *pdev)
delete_netxbig_led(&leds_data[i]);

gpio_ext_free(pdata->gpio_ext);
err_free_data:
kfree(leds_data);

return ret;
}

Expand All @@ -404,7 +401,6 @@ static int __devexit netxbig_led_remove(struct platform_device *pdev)
delete_netxbig_led(&leds_data[i]);

gpio_ext_free(pdata->gpio_ext);
kfree(leds_data);

return 0;
}
Expand Down

0 comments on commit 8095c38

Please sign in to comment.