[PATCH v2] Input: Introduce the use of managed version of kzalloc
From: Himangi Saraogi <hidden>
Date: 2014-05-10 18:16:33
Also in:
lkml
Subsystem:
dialog semiconductor drivers, input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers:
Support Opensource, Dmitry Torokhov, Linus Torvalds
This patch moves data allocated using kzalloc to managed data allocated
using devm_kzalloc and cleans now unnecessary kfrees in probe and remove
functions. This data is the third argument to da9052_request_irq in the
two cases below.
Signed-off-by: Himangi Saraogi <redacted>
Acked-by: Julia Lawall <redacted>
Acked-by: Opensource [Anthony Olech] <redacted>
---
v2: shift semantic patch from description to below ---
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);
...>
}
drivers/input/misc/da9052_onkey.c | 4 +---
drivers/input/touchscreen/da9052_tsi.c | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/input/misc/da9052_onkey.c b/drivers/input/misc/da9052_onkey.c
index 184c8f2..6fc8243 100644
--- a/drivers/input/misc/da9052_onkey.c
+++ b/drivers/input/misc/da9052_onkey.c@@ -84,7 +84,7 @@ static int da9052_onkey_probe(struct platform_device *pdev) return -EINVAL; } - onkey = kzalloc(sizeof(*onkey), GFP_KERNEL); + onkey = devm_kzalloc(&pdev->dev, sizeof(*onkey), GFP_KERNEL); input_dev = input_allocate_device(); if (!onkey || !input_dev) { dev_err(&pdev->dev, "Failed to allocate memory\n");
@@ -126,7 +126,6 @@ err_free_irq: cancel_delayed_work_sync(&onkey->work); err_free_mem: input_free_device(input_dev); - kfree(onkey); return error; }
@@ -139,7 +138,6 @@ static int da9052_onkey_remove(struct platform_device *pdev) cancel_delayed_work_sync(&onkey->work); input_unregister_device(onkey->input); - kfree(onkey); return 0; }
diff --git a/drivers/input/touchscreen/da9052_tsi.c b/drivers/input/touchscreen/da9052_tsi.c
index ab64d58..dff6a2e 100644
--- a/drivers/input/touchscreen/da9052_tsi.c
+++ b/drivers/input/touchscreen/da9052_tsi.c@@ -238,7 +238,7 @@ static int da9052_ts_probe(struct platform_device *pdev) if (!da9052) return -EINVAL; - tsi = kzalloc(sizeof(struct da9052_tsi), GFP_KERNEL); + tsi = devm_kzalloc(&pdev->dev, sizeof(struct da9052_tsi), GFP_KERNEL); input_dev = input_allocate_device(); if (!tsi || !input_dev) { error = -ENOMEM;
@@ -311,7 +311,6 @@ err_free_datardy_irq: err_free_pendwn_irq: da9052_free_irq(tsi->da9052, DA9052_IRQ_PENDOWN, tsi); err_free_mem: - kfree(tsi); input_free_device(input_dev); return error;
@@ -327,7 +326,6 @@ static int da9052_ts_remove(struct platform_device *pdev) da9052_free_irq(tsi->da9052, DA9052_IRQ_PENDOWN, tsi); input_unregister_device(tsi->dev); - kfree(tsi); return 0; }
--
1.9.1