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

Commit bfb7971c authored by Himangi Saraogi's avatar Himangi Saraogi Committed by Ralf Baechle
Browse files

MIPS: SEAD3: 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, the now unnecessary labels out_mem and out are done
away with. The error handling code is moved under if and return 0 is now
at the end of the function.

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>
Tested-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Reviewed-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/6977/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent acd8bc1a

arch/mips/mti-sead3/sead3-pic32-i2c-drv.c

+13 −23
Original line number Diff line number Diff line
@@ -312,16 +312,13 @@ static int i2c_platform_probe(struct platform_device *pdev) 


	pr_debug("i2c_platform_probe\n");

	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!r) {

		ret = -ENODEV;

		goto out;

	}

	if (!r)

		return -ENODEV;



	priv = kzalloc(sizeof(struct i2c_platform_data), GFP_KERNEL);

	if (!priv) {

		ret = -ENOMEM;

		goto out;

	}

	priv = devm_kzalloc(&pdev->dev, sizeof(struct i2c_platform_data),

			    GFP_KERNEL);

	if (!priv)

		return -ENOMEM;



	/* FIXME: need to allocate resource in PIC32 space */

#if 0
@@ -330,10 +327,8 @@ static int i2c_platform_probe(struct platform_device *pdev) 
#else

	priv->base = r->start;

#endif

	if (!priv->base) {

		ret = -EBUSY;

		goto out_mem;

	}

	if (!priv->base)

		return -EBUSY;



	priv->xfer_timeout = 200;

	priv->ack_timeout = 200;
@@ -348,19 +343,15 @@ static int i2c_platform_probe(struct platform_device *pdev) 
	i2c_platform_setup(priv);



	ret = i2c_add_numbered_adapter(&priv->adap);

	if (ret == 0) {

		platform_set_drvdata(pdev, priv);

		return 0;

	}



	if (ret) {

		i2c_platform_disable(priv);



out_mem:

	kfree(priv);

out:

		return ret;

	}



	platform_set_drvdata(pdev, priv);

	return 0;

}



static int i2c_platform_remove(struct platform_device *pdev)

{

	struct i2c_platform_data *priv = platform_get_drvdata(pdev);
@@ -369,7 +360,6 @@ static int i2c_platform_remove(struct platform_device *pdev) 
	platform_set_drvdata(pdev, NULL);

	i2c_del_adapter(&priv->adap);

	i2c_platform_disable(priv);

	kfree(priv);

	return 0;

}