From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 23 Mar 2011 21:30:07 +0100 (CET) Received: from mail-wy0-f177.google.com ([74.125.82.177]:55165 "EHLO mail-wy0-f177.google.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S1491891Ab1CWUaE (ORCPT ); Wed, 23 Mar 2011 21:30:04 +0100 Received: by wyb28 with SMTP id 28so8823242wyb.36 for ; Wed, 23 Mar 2011 13:29:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:user-agent:cc :references:in-reply-to:organization:mime-version:content-type :content-transfer-encoding:message-id; bh=JS22pmBZRRvsNbclmSLz8WPaXDTRz2YVIa1QpXYBkEM=; b=xLVgCvlU+j/OG1AEFHdoXOdzCADWVkaRmGpxJ7yH1JqAPB+zXBdOPNy+ht7AYEYkZE G3w/2IlorjCTdrf6WhbujtlnE6sqOOvM6ls/PLHVqnFPtsknRUzgcMqf+eN1v7Sn2XH5 zQFxPIBj1tTcnhscbSPqvInVQvDd5UTErbN6A= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:user-agent:cc:references:in-reply-to :organization:mime-version:content-type:content-transfer-encoding :message-id; b=lNeyKpdqBl6u1b0M6zz4JTKWQHLoSJLkJRFJVYgDYYrP0CQRzYuVK2JzJWxPAmI0EK 7UeW2b5sVr0wPPi3UvomEjGQWiT+eDNVRX/slNxrNf6tPNRdh8PH3XMVoKzQtDqI+b7k mDAkT70pktA/5XlkfxHJl/cZT5Wthj7+2puG4= Received: by 10.227.130.203 with SMTP id u11mr6780091wbs.219.1300912198364; Wed, 23 Mar 2011 13:29:58 -0700 (PDT) Received: from bender.localnet (fbx.mimichou.net [82.236.225.16]) by mx.google.com with ESMTPS id b20sm3971202wbb.67.2011.03.23.13.29.55 (version=SSLv3 cipher=OTHER); Wed, 23 Mar 2011 13:29:56 -0700 (PDT) From: Florian Fainelli To: Joe Perches Subject: Re: [trivial PATCH 1/2] treewide: Fix iomap resource size miscalculations Date: Wed, 23 Mar 2011 21:29:52 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.35-28-generic; KDE/4.5.1; x86_64; ; ) Cc: Jiri Kosina , Srinidhi Kasagar , Linus Walleij , David Brown , Daniel Walker , Bryan Huntsman , Wim Van Sebroeck , Russell King , Ralf Baechle , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mips@linux-mips.org, linux-arm-msm@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-watchdog@vger.kernel.org References: In-Reply-To: Organization: OpenWrt MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201103232129.53053.florian@openwrt.org> Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 29428 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: florian@openwrt.org Precedence: bulk X-list: linux-mips On Wednesday 23 March 2011 20:55:36 Joe Perches wrote: > Convert off-by-1 r->end - r->start to resource_size(r) > > Signed-off-by: Joe Perches Acked-by: Florian Fainelli (for rb532 and bcm63xx_wdt) > --- > arch/arm/mach-ux500/mbox-db5500.c | 6 ++---- > arch/mips/rb532/gpio.c | 2 +- > drivers/video/msm/mddi.c | 2 +- > drivers/watchdog/bcm63xx_wdt.c | 2 +- > 4 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/mach-ux500/mbox-db5500.c > b/arch/arm/mach-ux500/mbox-db5500.c index a4ffb9f..2b2d51c 100644 > --- a/arch/arm/mach-ux500/mbox-db5500.c > +++ b/arch/arm/mach-ux500/mbox-db5500.c > @@ -416,8 +416,7 @@ struct mbox *mbox_setup(u8 mbox_id, mbox_recv_cb_t > *mbox_cb, void *priv) dev_dbg(&(mbox->pdev->dev), > "Resource name: %s start: 0x%X, end: 0x%X\n", > resource->name, resource->start, resource->end); > - mbox->virtbase_peer = > - ioremap(resource->start, resource->end - resource->start); > + mbox->virtbase_peer = ioremap(resource->start, resource_size(resource)); > if (!mbox->virtbase_peer) { > dev_err(&(mbox->pdev->dev), "Unable to ioremap peer mbox\n"); > mbox = NULL; > @@ -440,8 +439,7 @@ struct mbox *mbox_setup(u8 mbox_id, mbox_recv_cb_t > *mbox_cb, void *priv) dev_dbg(&(mbox->pdev->dev), > "Resource name: %s start: 0x%X, end: 0x%X\n", > resource->name, resource->start, resource->end); > - mbox->virtbase_local = > - ioremap(resource->start, resource->end - resource->start); > + mbox->virtbase_local = ioremap(resource->start, resource_size(resource)); > if (!mbox->virtbase_local) { > dev_err(&(mbox->pdev->dev), "Unable to ioremap local mbox\n"); > mbox = NULL; > diff --git a/arch/mips/rb532/gpio.c b/arch/mips/rb532/gpio.c > index 37de05d..6c47dfe 100644 > --- a/arch/mips/rb532/gpio.c > +++ b/arch/mips/rb532/gpio.c > @@ -185,7 +185,7 @@ int __init rb532_gpio_init(void) > struct resource *r; > > r = rb532_gpio_reg0_res; > - rb532_gpio_chip->regbase = ioremap_nocache(r->start, r->end - r->start); > + rb532_gpio_chip->regbase = ioremap_nocache(r->start, resource_size(r)); > > if (!rb532_gpio_chip->regbase) { > printk(KERN_ERR "rb532: cannot remap GPIO register 0\n"); > diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c > index b66d86a..178b072 100644 > --- a/drivers/video/msm/mddi.c > +++ b/drivers/video/msm/mddi.c > @@ -679,7 +679,7 @@ static int __devinit mddi_probe(struct platform_device > *pdev) printk(KERN_ERR "mddi: no associated mem resource!\n"); > return -ENOMEM; > } > - mddi->base = ioremap(resource->start, resource->end - resource->start); > + mddi->base = ioremap(resource->start, resource_size(resource)); > if (!mddi->base) { > printk(KERN_ERR "mddi: failed to remap base!\n"); > ret = -EINVAL; > diff --git a/drivers/watchdog/bcm63xx_wdt.c > b/drivers/watchdog/bcm63xx_wdt.c index 3c5045a..5064e83 100644 > --- a/drivers/watchdog/bcm63xx_wdt.c > +++ b/drivers/watchdog/bcm63xx_wdt.c > @@ -248,7 +248,7 @@ static int __devinit bcm63xx_wdt_probe(struct > platform_device *pdev) return -ENODEV; > } > > - bcm63xx_wdt_device.regs = ioremap_nocache(r->start, r->end - r->start); > + bcm63xx_wdt_device.regs = ioremap_nocache(r->start, resource_size(r)); > if (!bcm63xx_wdt_device.regs) { > dev_err(&pdev->dev, "failed to remap I/O resources\n"); > return -ENXIO;