Skip to contentSkip to conversation

Input: Introduce the use of the managed version of kzalloc

PATCH New Himangi Saraogi 1 participant 1 message May 16, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Input: Introduce the use of the managed version of kzalloc

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);
...>
}

---
Can I make the code simpler by changing the code:

        poll_dev = input_allocate_polled_device();
        if (!poll_dev) {
                error = -ENOMEM;
                goto failed;
        }

to have only return -ENOMEM as there is no error message for failure of kzalloc and the call to input_free_polled_device does nothing when poll_dev is null.

 drivers/input/keyboard/jornada680_kbd.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/input/keyboard/jornada680_kbd.c +2 -3
index 69b1f00..02c8f5b 100644
@@ -185,7 +185,8 @@ static int jornada680kbd_probe(struct platform_device *pdev)
 	struct input_dev *input_dev;
 	int i, error;
 
-	jornadakbd = kzalloc(sizeof(struct jornadakbd), GFP_KERNEL);
+	jornadakbd = devm_kzalloc(&pdev->dev, sizeof(struct jornadakbd),
+				  GFP_KERNEL);
 	if (!jornadakbd)
 		return -ENOMEM;
 
@@ -233,7 +234,6 @@ static int jornada680kbd_probe(struct platform_device *pdev)
 	printk(KERN_ERR "Jornadakbd: failed to register driver, error: %d\n",
 		error);
 	input_free_polled_device(poll_dev);
-	kfree(jornadakbd);
 	return error;
 
 }
@@ -244,7 +244,6 @@ static int jornada680kbd_remove(struct platform_device *pdev)
 
 	input_unregister_polled_device(jornadakbd->poll_dev);
 	input_free_polled_device(jornadakbd->poll_dev);
-	kfree(jornadakbd);
 
 	return 0;
 }
Signature · 1 line
1.9.1