From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Maxin B. John" Subject: [PATCH 2/2] i2c: busses: i2c-ocores: switch to devm_request_and_ioremap Date: Sun, 23 Sep 2012 09:33:58 -0400 Message-ID: <20120923133358.GA22861@linux-3ix0.site> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline Sender: linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Peter Korsgaard Cc: "Ben Dooks (embedded platforms)" , "Wolfram Sang (embedded platforms)" , Grant Likely , Rob Herring , linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, "Jean Delvare (PC drivers, core)" List-Id: linux-i2c@vger.kernel.org This drops a few lines of code and allows common APIs to handle those for us. Signed-off-by: Maxin B. John --- 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) {