lkml.org 
[lkml]   [2012]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 5/6] i2c: ibm_iic: use devm_ functions
Date
From: Julia Lawall <Julia.Lawall@lip6.fr>

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 <Julia.Lawall@lip6.fr>

---
Not compiled.

drivers/i2c/busses/i2c-ibm_iic.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 806e225..76435c2 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -699,7 +699,7 @@ static int __devinit iic_probe(struct platform_device *ofdev)
const u32 *freq;
int ret;

- dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+ dev = devm_kzalloc(&ofdev->dev, sizeof(*dev), GFP_KERNEL);
if (!dev) {
dev_err(&ofdev->dev, "failed to allocate device data\n");
return -ENOMEM;
@@ -774,7 +774,6 @@ error_cleanup:
iounmap(dev->vaddr);

dev_set_drvdata(&ofdev->dev, NULL);
- kfree(dev);
return ret;
}

@@ -795,7 +794,6 @@ static int __devexit iic_remove(struct platform_device *ofdev)
}

iounmap(dev->vaddr);
- kfree(dev);

return 0;
}


\
 
 \ /
  Last update: 2012-08-25 20:21    [W:0.035 / U:0.880 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site