Commit e8cba3cd authored May 20, 2014 by Himangi Saraogi Committed by Guenter Roeck May 21, 2014

hwmon: (ultra45_env) Introduce 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);
  ...>
}

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

parent 41082d66

drivers/hwmon/ultra45_env.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -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 @@ static int env_probe(struct platform_device *op)
		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;