diff options
author | Linus Walleij <linus.walleij@stericsson.com> | 2009-06-13 18:20:36 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-06-16 17:42:16 -0400 |
commit | c6ffddea36dd576b70dfbd10eb5d2b287b786dca (patch) | |
tree | 9849cac5ca77534e38b4cb3c35a09d980ae84ff3 /drivers/i2c/busses/i2c-versatile.c | |
parent | 18904c0ecdf2cf22347da2adc4b273e9570333d8 (diff) |
i2c: Use resource_size macro
This replace all instances in the i2c busses tree of
res->end - res->start + 1 with the handy macro resource_size(res)
from ioport.h (coming in from platform_device.h).
This was created with a simple
sed -i -e 's/\([a-z]*\)->end *- *[a-z]*->start *+ *1/resource_size(\1)/g'
Then manually replacing the PXA redefiniton of the same kind
of macro manually. Recompiled some ARM defconfigs I could find to
make a rough test so it shouldn't break anything, though I
couldn't see exactly which configs you need for all the drivers.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-versatile.c')
-rw-r--r-- | drivers/i2c/busses/i2c-versatile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-versatile.c b/drivers/i2c/busses/i2c-versatile.c index fede619ba227..70de82163463 100644 --- a/drivers/i2c/busses/i2c-versatile.c +++ b/drivers/i2c/busses/i2c-versatile.c | |||
@@ -76,7 +76,7 @@ static int i2c_versatile_probe(struct platform_device *dev) | |||
76 | goto err_out; | 76 | goto err_out; |
77 | } | 77 | } |
78 | 78 | ||
79 | if (!request_mem_region(r->start, r->end - r->start + 1, "versatile-i2c")) { | 79 | if (!request_mem_region(r->start, resource_size(r), "versatile-i2c")) { |
80 | ret = -EBUSY; | 80 | ret = -EBUSY; |
81 | goto err_out; | 81 | goto err_out; |
82 | } | 82 | } |
@@ -87,7 +87,7 @@ static int i2c_versatile_probe(struct platform_device *dev) | |||
87 | goto err_release; | 87 | goto err_release; |
88 | } | 88 | } |
89 | 89 | ||
90 | i2c->base = ioremap(r->start, r->end - r->start + 1); | 90 | i2c->base = ioremap(r->start, resource_size(r)); |
91 | if (!i2c->base) { | 91 | if (!i2c->base) { |
92 | ret = -ENOMEM; | 92 | ret = -ENOMEM; |
93 | goto err_free; | 93 | goto err_free; |
@@ -118,7 +118,7 @@ static int i2c_versatile_probe(struct platform_device *dev) | |||
118 | err_free: | 118 | err_free: |
119 | kfree(i2c); | 119 | kfree(i2c); |
120 | err_release: | 120 | err_release: |
121 | release_mem_region(r->start, r->end - r->start + 1); | 121 | release_mem_region(r->start, resource_size(r)); |
122 | err_out: | 122 | err_out: |
123 | return ret; | 123 | return ret; |
124 | } | 124 | } |