Skip to contentSkip to conversation

touchscreen: Introduce the use of the managed version of kzalloc

PATCH In review Himangi Saraogi 2 participants 2 messages May 21, 2014

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

Himangi Saraogi

author
#0 lore raw

PATCH 1/1 touchscreen: 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. Also data allocated using input_allocate_device is moved to devm_input_allocate_device and unnecessary labels are removed.

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 <[email protected]>
---
 drivers/input/touchscreen/da9034-ts.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)
drivers/input/touchscreen/da9034-ts.c +5 -12
index 8ccf7bb..ed85744 100644
@@ -303,7 +303,8 @@ static int da9034_touch_probe(struct platform_device *pdev)
 	struct input_dev *input_dev;
 	int ret;
 
-	touch = kzalloc(sizeof(struct da9034_touch), GFP_KERNEL);
+	touch = devm_kzalloc(&pdev->dev, sizeof(struct da9034_touch),
+			     GFP_KERNEL);
 	if (touch == NULL) {
 		dev_err(&pdev->dev, "failed to allocate driver data\n");
 		return -ENOMEM;

@@ -322,11 +323,10 @@ static int da9034_touch_probe(struct platform_device *pdev)
 	INIT_DELAYED_WORK(&touch->tsi_work, da9034_tsi_work);
 	touch->notifier.notifier_call = da9034_touch_notifier;
 
-	input_dev = input_allocate_device();
+	input_dev = devm_input_allocate_device(&pdev->dev);
 	if (!input_dev) {
 		dev_err(&pdev->dev, "failed to allocate input device\n");
-		ret = -ENOMEM;
-		goto err_free_touch;
+		return -ENOMEM;
 	}
 
 	input_dev->name		= pdev->name;

@@ -348,16 +348,10 @@ static int da9034_touch_probe(struct platform_device *pdev)
 
 	ret = input_register_device(input_dev);
 	if (ret)
-		goto err_free_input;
+		return ret;
 
 	platform_set_drvdata(pdev, touch);
 	return 0;
-
-err_free_input:
-	input_free_device(input_dev);
-err_free_touch:
-	kfree(touch);
-	return ret;
 }
 
 static int da9034_touch_remove(struct platform_device *pdev)

@@ -365,7 +359,6 @@ static int da9034_touch_remove(struct platform_device *pdev)
 	struct da9034_touch *touch = platform_get_drvdata(pdev);
 
 	input_unregister_device(touch->input_dev);
-	kfree(touch);
 
 	return 0;
 }
Signature · 1 line
1.9.1
maintainer
#1 lore raw

Hi Himangi,

Quoted 2 lines · Himangi Saraogi
drivers/input/touchscreen/da9034-ts.c +1 -1
-	input_dev = input_allocate_device();
+	input_dev = devm_input_allocate_device(&pdev->dev);

...

drivers/input/touchscreen/da9034-ts.c static int da9034_touch_remove(struct platform_device *pdev) · line 361

Quoted 4 lines
drivers/input/touchscreen/da9034-ts.c +0 -0
@@ -365,7 +359,6 @@ static int da9034_touch_remove(struct platform_device *pdev)
 	struct da9034_touch *touch = platform_get_drvdata(pdev);
 
 	input_unregister_device(touch->input_dev);

When using managed input devices calling input_unregister_device() is unnecessary. Whole da9034_touch_remove() can be removed. I fixed it up locally and applied your patch.

Thanks!

Quoted 7 lines
drivers/input/touchscreen/da9034-ts.c +0 -1
-	kfree(touch);
 
 	return 0;
 }
Signature · 1 line
1.9.1
Signature · 1 line
Dmitry