hwmon: Introduce the use of the managed version of kzalloc
PATCH 1/1 hwmon: 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, the unnecessary label out_free is 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);
...>
}
---
Not compile tested.
To send to: Jean Delvare <[email protected]>,Guenter Roeck <[email protected]>, [email protected],[email protected]
drivers/hwmon/ultra45_env.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/hwmon/ultra45_env.c +3 -6
@@ -252,7 +252,7 @@ static const struct attribute_group env_group = {static int env_probe (struct platform_device *op) { -struct env *p =kzalloc (sizeof (*p),GFP_KERNEL ); +struct env *p =devm_kzalloc (&op->dev,sizeof (*p),GFP_KERNEL );int err = -ENOMEM ;if (!p)
@@ -262,7 +262,7 @@ static int env_probe(struct platform_device *op) p->regs =of_ioremap (&op->resource[0 ],0 ,REG_SIZE ,"pic16f747" );if (!p->regs) - goto out_free; + goto out; err =sysfs_create_group (&op->dev.kobj, &env_group);if (err)
@@ -285,9 +285,7 @@ out_sysfs_remove_group: out_iounmap:of_iounmap (&op->resource[0 ], p->regs,REG_SIZE ); - -out_free: -kfree (p); + goto out; }
@@ -299,7 +297,6 @@ static int env_remove(struct platform_device *op)sysfs_remove_group (&op->dev.kobj, &env_group);hwmon_device_unregister (p->hwmon_dev);of_iounmap (&op->resource[0 ], p->regs,REG_SIZE ); -kfree (p); }return 0 ;
Signature · 1 line
1.9.1
Guenter Roeck
maintainerQuoted 70 lines · Himangi Saraogi
This patch moves data allocated using kzalloc to managed data allocated using
devm_kzallocand cleans now unnecessary kfrees in probe and remove functions. Also, the unnecessary labelout_freeis removed.The following Coccinelle semantic patch was used for making the change:
@platform@
identifier p, probefn, removefn;
@@
structplatform_driverp = {
.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.To send to: Jean Delvare <[email protected]>,Guenter Roeck <[email protected]>, [email protected],[email protected]
drivers/hwmon/ultra45_env.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)drivers/hwmon/ultra45_env.c +2
-2@@ -252,7 +252,7 @@ static const struct attribute_group env_group = {static int env_probe (struct platform_device *op) { -struct env *p =kzalloc (sizeof (*p),GFP_KERNEL ); +struct env *p =devm_kzalloc (&op->dev,sizeof (*p),GFP_KERNEL );int err = -ENOMEM ;if (!p)@@ -262,7 +262,7 @@ static int env_probe(struct platform_device *op) p->regs =of_ioremap (&op->resource[0 ],0 ,REG_SIZE ,"pic16f747" );if (!p->regs) - goto out_free; + goto out; err =sysfs_create_group (&op->dev.kobj, &env_group);if (err)
drivers/hwmon/ultra45_env.c out_sysfs_remove_group: · line 290
Quoted 9 lines
drivers/hwmon/ultra45_env.c +1
-3@@ -285,9 +285,7 @@ out_sysfs_remove_group: out_iounmap:of_iounmap (&op->resource[0 ], p->regs,REG_SIZE ); - -out_free: -kfree (p); + goto out; }
This introduces a whitespace error, and results in really ugly code.
err = 0;
out:
return err;
out_sysfs_remove_group:
sysfs_remove_group(&op->dev.kobj, &env_group);
out_iounmap:
of_iounmap(&op->resource[0], p->regs, REG_SIZE); goto out; }
Ok, the code is already ugly, but it doesn't make sense to me to spend time on it without cleaning it up.
Guenter
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors