Skip to contentSkip to conversation

input: jornada680_kbd: Allocate resources using managed interfaces

PATCH Applied Himangi Saraogi 2 participants 2 messages May 24, 2014 – May 26, 2014

Subsystems (2)
HID Input drivers
lore
Share & tools
lore

Himangi Saraogi

author
#0 lore raw

PATCH 1/1 input: jornada680_kbd: Allocate resources using managed interfaces

This patch moves most data allocated in the probe function from unmanaged interfaces to managed interfaces. The kfrees and error handling code is done away with. Also, the unnecesary labels are removed and the function mrstouch_remove is removed as it becomes empty after removing the no longer required function calls. Also, linux/device.h is added to make sure the devm_*() routine declarations are unambiguously available.

The following Coccinelle semantic patch was used for making a part of 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 <[email protected]>

---
Not compile tested due to incompatible architecture.

 drivers/input/keyboard/jornada680_kbd.c | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)
drivers/input/keyboard/jornada680_kbd.c +4 -17
index 69b1f00..806dc6b 100644
@@ -16,6 +16,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/device.h>
 #include <linux/input.h>
 #include <linux/input-polldev.h>
 #include <linux/interrupt.h>

@@ -185,11 +186,12 @@ 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;
 
-	poll_dev = input_allocate_polled_device();
+	poll_dev = devm_input_allocate_polled_device(&pdev->dev);
 	if (!poll_dev) {
 		error = -ENOMEM;
 		goto failed;

@@ -232,21 +234,7 @@ static int jornada680kbd_probe(struct platform_device *pdev)
  failed:
 	printk(KERN_ERR "Jornadakbd: failed to register driver, error: %d\n",
 		error);
-	input_free_polled_device(poll_dev);
-	kfree(jornadakbd);
 	return error;
-
-}
-
-static int jornada680kbd_remove(struct platform_device *pdev)
-{
-	struct jornadakbd *jornadakbd = platform_get_drvdata(pdev);
-
-	input_unregister_polled_device(jornadakbd->poll_dev);
-	input_free_polled_device(jornadakbd->poll_dev);
-	kfree(jornadakbd);
-
-	return 0;
 }
 
 static struct platform_driver jornada680kbd_driver = {

@@ -255,7 +243,6 @@ static struct platform_driver jornada680kbd_driver = {
 		.owner	= THIS_MODULE,
 	},
 	.probe	= jornada680kbd_probe,
-	.remove	= jornada680kbd_remove,
 };
 module_platform_driver(jornada680kbd_driver);
Signature · 1 line
1.9.1
maintainer Applied
#1 lore raw
Quoted 7 lines · Himangi Saraogi

This patch moves most data allocated in the probe function from unmanaged interfaces to managed interfaces. The kfrees and error handling code is done away with. Also, the unnecesary labels are removed and the function mrstouch_remove is removed as it becomes empty after removing the no longer required function calls. Also, linux/device.h is added to make sure the devm_*() routine declarations are unambiguously available.

Applied, thank you.

Signature · 1 line
Dmitry