Commit 12b5c38f authored by Himangi Saraogi's avatar Himangi Saraogi Committed by David S. Miller

ieee802154: 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. An explicit linux/device.h include is added to make sure
the devm_*() routine declarations are unambiguously available.

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: default avatarHimangi Saraogi <himangi774@gmail.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7e910357
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/device.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <net/mac802154.h> #include <net/mac802154.h>
#include <net/wpan-phy.h> #include <net/wpan-phy.h>
...@@ -228,7 +229,8 @@ static int fakelb_probe(struct platform_device *pdev) ...@@ -228,7 +229,8 @@ static int fakelb_probe(struct platform_device *pdev)
int err = -ENOMEM; int err = -ENOMEM;
int i; int i;
priv = kzalloc(sizeof(struct fakelb_priv), GFP_KERNEL); priv = devm_kzalloc(&pdev->dev, sizeof(struct fakelb_priv),
GFP_KERNEL);
if (!priv) if (!priv)
goto err_alloc; goto err_alloc;
...@@ -248,7 +250,6 @@ static int fakelb_probe(struct platform_device *pdev) ...@@ -248,7 +250,6 @@ static int fakelb_probe(struct platform_device *pdev)
err_slave: err_slave:
list_for_each_entry(dp, &priv->list, list) list_for_each_entry(dp, &priv->list, list)
fakelb_del(dp); fakelb_del(dp);
kfree(priv);
err_alloc: err_alloc:
return err; return err;
} }
...@@ -260,7 +261,6 @@ static int fakelb_remove(struct platform_device *pdev) ...@@ -260,7 +261,6 @@ static int fakelb_remove(struct platform_device *pdev)
list_for_each_entry_safe(dp, temp, &priv->list, list) list_for_each_entry_safe(dp, temp, &priv->list, list)
fakelb_del(dp); fakelb_del(dp);
kfree(priv);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment