@@ -369,15 +369,15 @@ static int 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));
- if (unlikely(!dev->base)) {
- ret = -ENXIO;
- goto err;
- }
+ dev->base = devm_ioremap_nocache(&pdev->dev, res->start,
+ resource_size(res));
+ if (unlikely(!dev->base))
+ return -ENXIO;
dev->dev = &pdev->dev;
platform_set_drvdata(pdev, dev);
@@ -387,10 +387,10 @@ static int 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;
+ return ret;
highlander_i2c_irq_enable(dev);
} else {
@@ -417,26 +417,16 @@ static int 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;
+ return ret;
}
ret = i2c_add_numbered_adapter(adap);
if (unlikely(ret)) {
dev_err(&pdev->dev, "failure adding adapter\n");
- goto err_free_irq;
+ return ret;
}
return 0;
-
-err_free_irq:
- if (dev->irq)
- free_irq(dev->irq, dev);
-err_unmap:
- iounmap(dev->base);
-err:
- kfree(dev);
-
- return ret;
}
static int highlander_i2c_remove(struct platform_device *pdev)
@@ -445,12 +435,6 @@ static int 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);
-
return 0;
}
Use devm_*() functions to make cleanup paths simpler. Signed-off-by: Jingoo Han <jg1.han@samsung.com> --- drivers/i2c/busses/i2c-highlander.c | 38 ++++++++++------------------------- 1 file changed, 11 insertions(+), 27 deletions(-)