[PATCH] Input: misc : Introduce the use of the managed version of kzalloc

[PATCH] Input: misc : Introduce the use of the managed version of kzalloc

[Himangi Saraogi]

This patch moves data allocated using kzalloc to managed data allocated
using devm_kzalloc and cleans now unnecessary kfrees in probe and remove
functions.

The following Coccinelle semantic patch was used for making the change:

@platform@
identifier p, probefn, removefn;
@@
struct platform_driver p = {
  .probe = probefn,
  .remove = removefn,
};

@prb@
identifier platform.probefn, pdev;
expression e, e1, e2;
@@
probefn(struct platform_device *pdev, ...) {
  <+...
- e = kzalloc(e1, e2)
+ e = devm_kzalloc(&pdev->dev, e1, e2)
  ...
?-kfree(e);
  ...+>
}

@rem depends on prb@
identifier platform.removefn;
expression e;
@@
removefn(...) {
  <...
- kfree(e);
  ...>
}

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
---
Would be better to add the definition of a
devm_input_allocate_polled_device, like there is a
devm_input_allocate_device defined?

 drivers/input/misc/sgi_btns.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/input/misc/sgi_btns.c b/drivers/input/misc/sgi_btns.c
index f104749..e2dea37 100644
--- a/drivers/input/misc/sgi_btns.c
+++ b/drivers/input/misc/sgi_btns.c
@@ -97,7 +97,8 @@ static int sgi_buttons_probe(struct platform_device *pdev)
 	struct input_dev *input;
 	int error, i;
 
-	bdev = kzalloc(sizeof(struct buttons_dev), GFP_KERNEL);
+	bdev = devm_kzalloc(&pdev->dev, sizeof(struct buttons_dev),
+			    GFP_KERNEL);
 	poll_dev = input_allocate_polled_device();
 	if (!bdev || !poll_dev) {
 		error = -ENOMEM;
@@ -137,7 +138,6 @@ static int sgi_buttons_probe(struct platform_device *pdev)
 
  err_free_mem:
 	input_free_polled_device(poll_dev);
-	kfree(bdev);
 	return error;
 }
 
@@ -147,7 +147,6 @@ static int sgi_buttons_remove(struct platform_device *pdev)
 
 	input_unregister_polled_device(bdev->poll_dev);
 	input_free_polled_device(bdev->poll_dev);
-	kfree(bdev);
 
 	return 0;
 }
-- 
1.9.1

Re: [PATCH] Input: misc : Introduce the use of the managed version of kzalloc

[Dmitry Torokhov]

Hi Himangi,

On Tue, May 20, 2014 at 08:39:18PM +0530, Himangi Saraogi wrote:
> Would be better to add the definition of a
> devm_input_allocate_polled_device, like there is a
> devm_input_allocate_device defined?

There is one, queued for 3.16. You should see it in linux-next.

Thanks.

-- 
Dmitry