* [merged] leds-convert-wm831x-status-driver-to-devm_kzalloc.patch removed from -mm tree
@ 2012-01-11 21:30 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2012-01-11 21:30 UTC (permalink / raw)
To: broonie, rpurdie, mm-commits
The patch titled
Subject: leds: convert wm831x status driver to devm_kzalloc()
has been removed from the -mm tree. Its filename was
leds-convert-wm831x-status-driver-to-devm_kzalloc.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: leds: convert wm831x status driver to devm_kzalloc()
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>
---
drivers/leds/leds-wm831x-status.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff -puN drivers/leds/leds-wm831x-status.c~leds-convert-wm831x-status-driver-to-devm_kzalloc drivers/leds/leds-wm831x-status.c
--- a/drivers/leds/leds-wm831x-status.c~leds-convert-wm831x-status-driver-to-devm_kzalloc
+++ a/drivers/leds/leds-wm831x-status.c
@@ -237,7 +237,8 @@ static int wm831x_status_probe(struct pl
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);
@@ -300,7 +301,6 @@ static int wm831x_status_probe(struct pl
err_led:
led_classdev_unregister(&drvdata->cdev);
- kfree(drvdata);
err:
return ret;
}
@@ -311,7 +311,6 @@ static int wm831x_status_remove(struct p
device_remove_file(drvdata->cdev.dev, &dev_attr_src);
led_classdev_unregister(&drvdata->cdev);
- kfree(drvdata);
return 0;
}
_
Patches currently in -mm which might be from broonie@opensource.wolfsonmicro.com are
origin.patch
linux-next.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-01-11 21:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-11 21:30 [merged] leds-convert-wm831x-status-driver-to-devm_kzalloc.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.