On Mon, May 26, 2014 at 12:20:38AM +0530, Himangi Saraogi wrote:
> 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, linux/device.h 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: Himangi Saraogi <himangi...@gmail.com>
> ---
> Not compiled due to incompatible architecture
For now, compile-tested.
Cascardo.
>
> v2: add linux/device.h include
> drivers/net/ethernet/ibm/ehea/ehea_main.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c
> b/drivers/net/ethernet/ibm/ehea/ehea_main.c
> index 538903b..a25f3c6 100644
> --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
> +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
> @@ -29,6 +29,7 @@
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> #include <linux/in.h>
> +#include<linux/device.h>
> #include <linux/ip.h>
> #include <linux/tcp.h>
> #include <linux/udp.h>
> @@ -3273,7 +3274,7 @@ static int ehea_probe_adapter(struct platform_device
> *dev)
> return -EINVAL;
> }
>
> - adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);
> + adapter = devm_kzalloc(&dev->dev, sizeof(*adapter), GFP_KERNEL);
> if (!adapter) {
> ret = -ENOMEM;
> dev_err(&dev->dev, "no mem for ehea_adapter\n");
> @@ -3359,7 +3360,6 @@ out_kill_eq:
>
> out_free_ad:
> list_del(&adapter->list);
> - kfree(adapter);
>
> out:
> ehea_update_firmware_handles();
> @@ -3386,7 +3386,6 @@ static int ehea_remove(struct platform_device *dev)
> ehea_destroy_eq(adapter->neq);
> ehea_remove_adapter_mr(adapter);
> list_del(&adapter->list);
> - kfree(adapter);
>
> ehea_update_firmware_handles();
>
> --
> 1.9.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
