Skip to contentSkip to conversation

Input: mc13783-pwrbutton: Allocate resources using managed interfaces

PATCH In review Himangi Saraogi 2 participants 2 messages May 25, 2014 – May 26, 2014

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

Himangi Saraogi

author
#0 lore raw

PATCH 1/1 Input: mc13783-pwrbutton: 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. The unnecesary labels are removed. Also, linux/device.h is added to make sure the devm_*() routine declarations are unambiguously available. The name of label free_priv is changed to unlock as it does not free priv anymore.

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]>
Acked-by Julia Lawall <[email protected]>

---
Not compiled due to incompatible architecture.

mc13xxx_irq_request is not devm'd, and doing so looks complicated due to the locks around the frees. Is there some way to resolve this issue?

To send to: Dmitry Torokhov <[email protected]>,[email protected],[email protected]

 drivers/input/misc/mc13783-pwrbutton.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)
drivers/input/misc/mc13783-pwrbutton.c +6 -13
index 0df6e8d..6afea1a 100644
@@ -28,6 +28,7 @@
 #include <linux/mfd/mc13783.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/device.h>
 
 struct mc13783_pwrb {
 	struct input_dev *pwr;

@@ -103,17 +104,16 @@ static int mc13783_pwrbutton_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	pwr = input_allocate_device();
+	pwr = devm_input_allocate_device(&pdev->dev);
 	if (!pwr) {
 		dev_dbg(&pdev->dev, "Can't allocate power button\n");
 		return -ENOMEM;
 	}
 
-	priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
 	if (!priv) {
-		err = -ENOMEM;
 		dev_dbg(&pdev->dev, "Can't allocate power button\n");
-		goto free_input_dev;
+		return -ENOMEM;
 	}
 
 	reg |= (pdata->b1on_flags & 0x3) << MC13783_POWER_CONTROL_2_ON1BDBNC;

@@ -140,7 +140,7 @@ static int mc13783_pwrbutton_probe(struct platform_device *pdev)
 					  button_irq, "b1on", priv);
 		if (err) {
 			dev_dbg(&pdev->dev, "Can't request irq\n");
-			goto free_priv;
+			goto unlock;
 		}
 	}
 

@@ -219,12 +219,8 @@ free_irq_b1:
 	if (pdata->b1on_flags & MC13783_BUTTON_ENABLE)
 		mc13xxx_irq_free(mc13783, MC13783_IRQ_ONOFD1, priv);
 
-free_priv:
+unlock:
 	mc13xxx_unlock(mc13783);
-	kfree(priv);
-
-free_input_dev:
-	input_free_device(pwr);
 
 	return err;
 }

@@ -247,9 +243,6 @@ static int mc13783_pwrbutton_remove(struct platform_device *pdev)
 
 	mc13xxx_unlock(priv->mc13783);
 
-	input_unregister_device(priv->pwr);
-	kfree(priv);
-
 	return 0;
 }
Signature · 1 line
1.9.1
maintainer
#1 lore raw
Quoted 41 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. The unnecesary labels are removed. Also, linux/device.h is added to make sure the devm_*() routine declarations are unambiguously available. The name of label free_priv is changed to unlock as it does not free priv anymore.

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

Quoted 7 lines
Signed-off-by Himangi Saraogi <[email protected]>
Acked-by Julia Lawall <[email protected]>

---
Not compiled due to incompatible architecture.

mc13xxx_irq_request is not devm'd, and doing so looks complicated due to the locks around the frees. Is there some way to resolve this issue?

Yes there us - let's leave the driver as is so we are not mixing the 2 styles.

Thanks.

Signature · 1 line
Dmitry