Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09b38aa1 authored by Himangi Saraogi's avatar Himangi Saraogi Committed by David S. Miller
Browse files

ehea: 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, 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: default avatarHimangi Saraogi <himangi774@gmail.com>
Compile-Tested-by: default avatarThadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c3aad35e

drivers/net/ethernet/ibm/ehea/ehea_main.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ 




#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt





#include <linux/device.h>

#include <linux/in.h>

#include <linux/in.h>

#include <linux/ip.h>

#include <linux/ip.h>

#include <linux/tcp.h>

#include <linux/tcp.h>
@@ -3273,7 +3274,7 @@ static int ehea_probe_adapter(struct platform_device *dev) 
		return -EINVAL;

		return -EINVAL;

	}

	}





	adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);

	adapter = devm_kzalloc(&dev->dev, sizeof(*adapter), GFP_KERNEL);

	if (!adapter) {

	if (!adapter) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		dev_err(&dev->dev, "no mem for ehea_adapter\n");

		dev_err(&dev->dev, "no mem for ehea_adapter\n");
@@ -3359,7 +3360,6 @@ static int ehea_probe_adapter(struct platform_device *dev) 




out_free_ad:

out_free_ad:

	list_del(&adapter->list);

	list_del(&adapter->list);

	kfree(adapter);





out:

out:

	ehea_update_firmware_handles();

	ehea_update_firmware_handles();
@@ -3386,7 +3386,6 @@ static int ehea_remove(struct platform_device *dev) 
	ehea_destroy_eq(adapter->neq);

	ehea_destroy_eq(adapter->neq);

	ehea_remove_adapter_mr(adapter);

	ehea_remove_adapter_mr(adapter);

	list_del(&adapter->list);

	list_del(&adapter->list);

	kfree(adapter);





	ehea_update_firmware_handles();

	ehea_update_firmware_handles();