From: Jean Delvare <khali@linux-fr.org>
To: Julia Lawall <julia@diku.dk>, Ben Dooks <ben-linux@fluff.org>
Cc: linux-i2c@vger.kernel.org, linus.walleij@stericsson.com,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH 5/5] drivers/i2c: Use resource_size
Date: Tue, 14 Jul 2009 09:50:18 +0200 [thread overview]
Message-ID: <20090714095018.16e009c8@hyperion.delvare> (raw)
In-Reply-To: <Pine.LNX.4.64.0907050837160.27464@ask.diku.dk>
Hi Julia,
On Sun, 5 Jul 2009 08:37:50 +0200 (CEST), Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
>
> Use the function resource_size, which reduces the chance of introducing
> off-by-one errors in calculating the resource size.
>
> The semantic patch that makes this change is as follows:
> (http://www.emn.fr/x-info/coccinelle/)
>
> // <smpl>
> @@
> struct resource *res;
> @@
>
> - (res->end - res->start) + 1
> + resource_size(res)
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia@diku.dk>
>
> ---
> drivers/i2c/busses/i2c-davinci.c | 6 +++---
> drivers/i2c/busses/i2c-omap.c | 6 +++---
> drivers/i2c/busses/i2c-sh_mobile.c | 2 +-
> drivers/i2c/busses/i2c-simtec.c | 2 +-
> 4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff -u -p a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
> --- a/drivers/i2c/busses/i2c-davinci.c 2009-03-28 23:34:54.000000000 +0100
> +++ b/drivers/i2c/busses/i2c-davinci.c 2009-07-04 21:38:17.000000000 +0200
> @@ -505,7 +505,7 @@ static int davinci_i2c_probe(struct plat
> return -ENODEV;
> }
>
> - ioarea = request_mem_region(mem->start, (mem->end - mem->start) + 1,
> + ioarea = request_mem_region(mem->start, resource_size(mem),
> pdev->name);
> if (!ioarea) {
> dev_err(&pdev->dev, "I2C region already claimed\n");
> @@ -568,7 +568,7 @@ err_free_mem:
> put_device(&pdev->dev);
> kfree(dev);
> err_release_region:
> - release_mem_region(mem->start, (mem->end - mem->start) + 1);
> + release_mem_region(mem->start, resource_size(mem));
>
> return r;
> }
> @@ -591,7 +591,7 @@ static int davinci_i2c_remove(struct pla
> kfree(dev);
>
> mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - release_mem_region(mem->start, (mem->end - mem->start) + 1);
> + release_mem_region(mem->start, resource_size(mem));
> return 0;
> }
>
> diff -u -p a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
> --- a/drivers/i2c/busses/i2c-omap.c 2009-06-24 21:18:49.000000000 +0200
> +++ b/drivers/i2c/busses/i2c-omap.c 2009-07-04 21:38:17.000000000 +0200
> @@ -806,7 +806,7 @@ omap_i2c_probe(struct platform_device *p
> return -ENODEV;
> }
>
> - ioarea = request_mem_region(mem->start, (mem->end - mem->start) + 1,
> + ioarea = request_mem_region(mem->start, resource_size(mem),
> pdev->name);
> if (!ioarea) {
> dev_err(&pdev->dev, "I2C region already claimed\n");
> @@ -905,7 +905,7 @@ err_free_mem:
> platform_set_drvdata(pdev, NULL);
> kfree(dev);
> err_release_region:
> - release_mem_region(mem->start, (mem->end - mem->start) + 1);
> + release_mem_region(mem->start, resource_size(mem));
>
> return r;
> }
> @@ -925,7 +925,7 @@ omap_i2c_remove(struct platform_device *
> iounmap(dev->base);
> kfree(dev);
> mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - release_mem_region(mem->start, (mem->end - mem->start) + 1);
> + release_mem_region(mem->start, resource_size(mem));
> return 0;
> }
>
> diff -u -p a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
> --- a/drivers/i2c/busses/i2c-sh_mobile.c 2009-01-09 22:41:01.000000000 +0100
> +++ b/drivers/i2c/busses/i2c-sh_mobile.c 2009-07-04 21:38:18.000000000 +0200
> @@ -563,7 +563,7 @@ static int sh_mobile_i2c_probe(struct pl
> goto err_irq;
> }
>
> - size = (res->end - res->start) + 1;
> + size = resource_size(res);
>
> pd->reg = ioremap(res->start, size);
> if (pd->reg == NULL) {
> diff -u -p a/drivers/i2c/busses/i2c-simtec.c b/drivers/i2c/busses/i2c-simtec.c
> --- a/drivers/i2c/busses/i2c-simtec.c 2008-12-07 19:29:06.000000000 +0100
> +++ b/drivers/i2c/busses/i2c-simtec.c 2009-07-04 21:38:16.000000000 +0200
> @@ -92,7 +92,7 @@ static int simtec_i2c_probe(struct platf
> goto err;
> }
>
> - size = (res->end-res->start)+1;
> + size = resource_size(res);
>
> pd->ioarea = request_mem_region(res->start, size, dev->name);
> if (pd->ioarea == NULL) {
Thanks for the patch. Ben, as all affected drivers are for embedded
platforms, I suggest that you pick this patch.
--
Jean Delvare
next prev parent reply other threads:[~2009-07-14 7:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-05 6:37 [PATCH 5/5] drivers/i2c: Use resource_size Julia Lawall
2009-07-14 7:50 ` Jean Delvare [this message]
[not found] ` <Pine.LNX.4.64.0907050837160.27464-QfmoRoYWmW9knbxzx/v8hQ@public.gmane.org>
2009-07-14 22:53 ` Ben Dooks
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090714095018.16e009c8@hyperion.delvare \
--to=khali@linux-fr.org \
--cc=ben-linux@fluff.org \
--cc=julia@diku.dk \
--cc=kernel-janitors@vger.kernel.org \
--cc=linus.walleij@stericsson.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).