[PATCH 2/2] i2c: busses: i2c-ocores: switch to devm_request_and_ioremap
From: Maxin B. John <hidden>
Date: 2012-09-23 13:31:16
Also in:
linux-i2c, lkml
Subsystem:
i2c subsystem, i2c subsystem host drivers, opencores i2c bus driver, the rest · Maintainers:
Wolfram Sang, Andi Shyti, Peter Korsgaard, Andrew Lunn, Linus Torvalds
This drops a few lines of code and allows common APIs to handle those for us. Signed-off-by: Maxin B. John <redacted> ---
diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index bffd550..740a89b 100644
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c@@ -283,18 +283,9 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev) if (!i2c) return -ENOMEM; - if (!devm_request_mem_region(&pdev->dev, res->start, - resource_size(res), pdev->name)) { - dev_err(&pdev->dev, "Memory region busy\n"); + i2c->base = devm_request_and_ioremap(&pdev->dev, res); + if (!i2c->base) return -EBUSY; - } - - i2c->base = devm_ioremap_nocache(&pdev->dev, res->start, - resource_size(res)); - if (!i2c->base) { - dev_err(&pdev->dev, "Unable to map registers\n"); - return -EIO; - } pdata = pdev->dev.platform_data; if (pdata) {