]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
hwmon: (ultra45_env) Introduce managed version of kzalloc
authorHimangi Saraogi <himangi774@gmail.com>
Tue, 20 May 2014 18:15:37 +0000 (23:45 +0530)
committerGuenter Roeck <linux@roeck-us.net>
Wed, 21 May 2014 23:02:27 +0000 (16:02 -0700)
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);
  ...>
}

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/ultra45_env.c

index fb3e69341c1bd72f82280c3904b891490a183132..7d4658636064d73c8fdf2efd32196f3e67432ace 100644 (file)
@@ -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)
@@ -286,8 +286,6 @@ 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;