From patchwork Sat Aug 25 17:41:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/6] i2c: cpm: use devm_ functions Date: Sat, 25 Aug 2012 07:41:34 -0000 From: Julia Lawall X-Patchwork-Id: 179981 Message-Id: <1345916499-6657-1-git-send-email-Julia.Lawall@lip6.fr> To: Jochen Friedrich Cc: kernel-janitors@vger.kernel.org, "Wolfram Sang \(embedded platforms\)" , linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, "Ben Dooks \(embedded platforms\)" , "Jean Delvare \(PC drivers, core\)" , linuxppc-dev@lists.ozlabs.org From: Julia Lawall The various devm_ functions allocate memory that is released when a driver detaches. This patch uses these functions for data that is allocated in the probe function of a platform device and is only freed in the remove function. Signed-off-by: Julia Lawall --- Not compiled. drivers/i2c/busses/i2c-cpm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c index c1e1096..ec97415 100644 --- a/drivers/i2c/busses/i2c-cpm.c +++ b/drivers/i2c/busses/i2c-cpm.c @@ -640,7 +640,7 @@ static int __devinit cpm_i2c_probe(struct platform_device *ofdev) struct cpm_i2c *cpm; const u32 *data; - cpm = kzalloc(sizeof(struct cpm_i2c), GFP_KERNEL); + cpm = devm_kzalloc(&ofdev->dev, sizeof(struct cpm_i2c), GFP_KERNEL); if (!cpm) return -ENOMEM; @@ -683,7 +683,6 @@ out_shut: cpm_i2c_shutdown(cpm); out_free: dev_set_drvdata(&ofdev->dev, NULL); - kfree(cpm); return result; } @@ -697,7 +696,6 @@ static int __devexit cpm_i2c_remove(struct platform_device *ofdev) cpm_i2c_shutdown(cpm); dev_set_drvdata(&ofdev->dev, NULL); - kfree(cpm); return 0; }