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>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/i2c/busses/i2c-pca-platform.c b/drivers/i2c/busses/i2c-pca-platform.c
index 7b23891b7d59..c4df9d411cd5 100644
--- a/drivers/i2c/busses/i2c-pca-platform.c
+++ b/drivers/i2c/busses/i2c-pca-platform.c
@@ -27,8 +27,6 @@
 #include <asm/irq.h>
 #include <asm/io.h>
 
-#define res_len(r)              ((r)->end - (r)->start + 1)
-
 struct i2c_pca_pf_data {
         void __iomem                    *reg_base;
         int                             irq;    /* if 0, use polling */
@@ -148,7 +146,7 @@ static int __devinit i2c_pca_pf_probe(struct platform_device *pdev)
                 goto e_print;
         }
 
-        if (!request_mem_region(res->start, res_len(res), res->name)) {
+        if (!request_mem_region(res->start, resource_size(res), res->name)) {
                 ret = -ENOMEM;
                 goto e_print;
         }
@@ -161,13 +159,13 @@ static int __devinit i2c_pca_pf_probe(struct platform_device *pdev)
 
         init_waitqueue_head(&i2c->wait);
 
-        i2c->reg_base = ioremap(res->start, res_len(res));
+        i2c->reg_base = ioremap(res->start, resource_size(res));
         if (!i2c->reg_base) {
                 ret = -ENOMEM;
                 goto e_remap;
         }
         i2c->io_base = res->start;
-        i2c->io_size = res_len(res);
+        i2c->io_size = resource_size(res);
         i2c->irq = irq;
 
         i2c->adap.nr = pdev->id >= 0 ? pdev->id : 0;
@@ -250,7 +248,7 @@ e_reqirq:
 e_remap:
         kfree(i2c);
 e_alloc:
-        release_mem_region(res->start, res_len(res));
+        release_mem_region(res->start, resource_size(res));
 e_print:
         printk(KERN_ERR "Registering PCA9564/PCA9665 FAILED! (%d)\n", ret);
         return ret;