diff options
author | Tobias Klauser <tklauser@distanz.ch> | 2009-11-10 21:55:19 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-11-10 21:55:19 -0500 |
commit | 6d1352420901b0a74e6149a891ff4457f7199651 (patch) | |
tree | a623ed28c2cde8d3dcb4b0c8681f682f4d58017e | |
parent | ee90732456fe8e75406fdd3cd136a4bfb7ce31f5 (diff) |
omap: Use resource_size
Use the resource_size function instead of manually calculating the
resource size. This reduces the chance of introducing off-by-one errors
and actually fixes one in mailbox.c.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/mailbox.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 15876828db2..f8657568b1b 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c | |||
@@ -366,7 +366,7 @@ int gpmc_cs_request(int cs, unsigned long size, unsigned long *base) | |||
366 | if (r < 0) | 366 | if (r < 0) |
367 | goto out; | 367 | goto out; |
368 | 368 | ||
369 | gpmc_cs_enable_mem(cs, res->start, res->end - res->start + 1); | 369 | gpmc_cs_enable_mem(cs, res->start, resource_size(res)); |
370 | *base = res->start; | 370 | *base = res->start; |
371 | gpmc_cs_set_reserved(cs, 1); | 371 | gpmc_cs_set_reserved(cs, 1); |
372 | out: | 372 | out: |
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index c035ad3426d..ef57b38a56a 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c | |||
@@ -300,7 +300,7 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev) | |||
300 | dev_err(&pdev->dev, "invalid mem resource\n"); | 300 | dev_err(&pdev->dev, "invalid mem resource\n"); |
301 | return -ENODEV; | 301 | return -ENODEV; |
302 | } | 302 | } |
303 | mbox_base = ioremap(res->start, res->end - res->start); | 303 | mbox_base = ioremap(res->start, resource_size(res)); |
304 | if (!mbox_base) | 304 | if (!mbox_base) |
305 | return -ENOMEM; | 305 | return -ENOMEM; |
306 | 306 | ||