diff options
author | Joe Perches <joe@perches.com> | 2011-06-09 12:13:32 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-06-10 08:55:36 -0400 |
commit | 28f65c11f2ffb3957259dece647a24f8ad2e241b (patch) | |
tree | 6b7621d09d10df89eedd908d4506fb9f457a909f /drivers/media | |
parent | 140a1ef2f91a00e1d25f0878c193abdc25bf6ebe (diff) |
treewide: Convert uses of struct resource to resource_size(ptr)
Several fixes as well where the +1 was missing.
Done via coccinelle scripts like:
@@
struct resource *ptr;
@@
- ptr->end - ptr->start + 1
+ resource_size(ptr)
and some grep and typing.
Mostly uncompiled, no cross-compilers.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/davinci/vpif.c | 2 | ||||
-rw-r--r-- | drivers/media/video/omap24xxcam.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/davinci/vpif.c b/drivers/media/video/davinci/vpif.c index 9f3bfc1eb240..af9680273ff9 100644 --- a/drivers/media/video/davinci/vpif.c +++ b/drivers/media/video/davinci/vpif.c | |||
@@ -422,7 +422,7 @@ static int __init vpif_probe(struct platform_device *pdev) | |||
422 | if (!res) | 422 | if (!res) |
423 | return -ENOENT; | 423 | return -ENOENT; |
424 | 424 | ||
425 | res_len = res->end - res->start + 1; | 425 | res_len = resource_size(res); |
426 | 426 | ||
427 | res = request_mem_region(res->start, res_len, res->name); | 427 | res = request_mem_region(res->start, res_len, res->name); |
428 | if (!res) | 428 | if (!res) |
diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c index f6626e87dbc5..69b60ba5dd7a 100644 --- a/drivers/media/video/omap24xxcam.c +++ b/drivers/media/video/omap24xxcam.c | |||
@@ -1768,14 +1768,13 @@ static int __devinit omap24xxcam_probe(struct platform_device *pdev) | |||
1768 | dev_err(cam->dev, "no mem resource?\n"); | 1768 | dev_err(cam->dev, "no mem resource?\n"); |
1769 | goto err; | 1769 | goto err; |
1770 | } | 1770 | } |
1771 | if (!request_mem_region(mem->start, (mem->end - mem->start) + 1, | 1771 | if (!request_mem_region(mem->start, resource_size(mem), pdev->name)) { |
1772 | pdev->name)) { | ||
1773 | dev_err(cam->dev, | 1772 | dev_err(cam->dev, |
1774 | "cannot reserve camera register I/O region\n"); | 1773 | "cannot reserve camera register I/O region\n"); |
1775 | goto err; | 1774 | goto err; |
1776 | } | 1775 | } |
1777 | cam->mmio_base_phys = mem->start; | 1776 | cam->mmio_base_phys = mem->start; |
1778 | cam->mmio_size = (mem->end - mem->start) + 1; | 1777 | cam->mmio_size = resource_size(mem); |
1779 | 1778 | ||
1780 | /* map the region */ | 1779 | /* map the region */ |
1781 | cam->mmio_base = (unsigned long) | 1780 | cam->mmio_base = (unsigned long) |