Skip to content

Commit

Permalink
leds: convert wm831x status driver to devm_kzalloc()
Browse files Browse the repository at this point in the history
Saves a small amount of code and systematically eliminates leaks.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.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>
  • Loading branch information
Mark Brown authored and Linus Torvalds committed Jan 11, 2012
1 parent 3b08094 commit 1713cb9
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/leds/leds-wm831x-status.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,8 @@ static int wm831x_status_probe(struct platform_device *pdev)
goto err;
}

drvdata = kzalloc(sizeof(struct wm831x_status), GFP_KERNEL);
drvdata = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_status),
GFP_KERNEL);
if (!drvdata)
return -ENOMEM;
dev_set_drvdata(&pdev->dev, drvdata);
Expand Down Expand Up @@ -300,7 +301,6 @@ static int wm831x_status_probe(struct platform_device *pdev)

err_led:
led_classdev_unregister(&drvdata->cdev);
kfree(drvdata);
err:
return ret;
}
Expand All @@ -311,7 +311,6 @@ static int wm831x_status_remove(struct platform_device *pdev)

device_remove_file(drvdata->cdev.dev, &dev_attr_src);
led_classdev_unregister(&drvdata->cdev);
kfree(drvdata);

return 0;
}
Expand Down

0 comments on commit 1713cb9

Please sign in to comment.