From: Julia Lawall <Julia.Lawall@xxxxxxx>
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@xxxxxxx>
---
Not compiled.
drivers/i2c/busses/i2c-highlander.c | 30 ++++++++++--------------------
1 file changed, 10 insertions(+), 20 deletions(-)
diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c
index 19515df..794a5ec 100644
--- a/drivers/i2c/busses/i2c-highlander.c
+++ b/drivers/i2c/busses/i2c-highlander.c
@@ -369,11 +369,13 @@ static int __devinit highlander_i2c_probe(struct platform_device *pdev)
return -ENODEV;
}
- dev = kzalloc(sizeof(struct highlander_i2c_dev), GFP_KERNEL);
+ dev = devm_kzalloc(&pdev->dev, sizeof(struct highlander_i2c_dev),
+ GFP_KERNEL);
if (unlikely(!dev))
return -ENOMEM;
- dev->base = ioremap_nocache(res->start, resource_size(res));
+ dev->base = devm_ioremap_nocache(&pdev->dev, res->start,
+ resource_size(res));
if (unlikely(!dev->base)) {
ret = -ENXIO;
goto err;
@@ -387,10 +389,11 @@ static int __devinit highlander_i2c_probe(struct platform_device *pdev)
dev->irq = 0;
if (dev->irq) {
- ret = request_irq(dev->irq, highlander_i2c_irq, 0,
- pdev->name, dev);
+ ret = devm_request_irq(&pdev->dev, dev->irq,
+ highlander_i2c_irq, 0,
+ pdev->name, dev);
if (unlikely(ret))
- goto err_unmap;
+ goto err;
highlander_i2c_irq_enable(dev);
} else {
@@ -417,25 +420,18 @@ static int __devinit highlander_i2c_probe(struct platform_device *pdev)
ret = highlander_i2c_reset(dev);
if (unlikely(ret)) {
dev_err(&pdev->dev, "controller didn't come up\n");
- goto err_free_irq;
+ goto err;
}
ret = i2c_add_numbered_adapter(adap);
if (unlikely(ret)) {
dev_err(&pdev->dev, "failure adding adapter\n");
- goto err_free_irq;
+ goto err;
}
return 0;
-err_free_irq:
- if (dev->irq)
- free_irq(dev->irq, dev);
-err_unmap:
- iounmap(dev->base);
err:
- kfree(dev);
-
platform_set_drvdata(pdev, NULL);
return ret;
@@ -447,12 +443,6 @@ static int __devexit highlander_i2c_remove(struct platform_device *pdev)
i2c_del_adapter(&dev->adapter);
- if (dev->irq)
- free_irq(dev->irq, dev);
-
- iounmap(dev->base);
- kfree(dev);
-
platform_set_drvdata(pdev, NULL);
return 0;
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
