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>

7 files changed, 11 insertions, 14 deletions

diff --git a/drivers/tty/serial/bfin_5xx.c b/drivers/tty/serial/bfin_5xx.c
index 9b1ff2b6bb37..ff6979181ac5 100644
--- a/drivers/tty/serial/bfin_5xx.c
+++ b/drivers/tty/serial/bfin_5xx.c
@@ -1304,8 +1304,7 @@ static int bfin_serial_probe(struct platform_device *pdev)
                         goto out_error_free_peripherals;
                 }
 
-                uart->port.membase = ioremap(res->start,
-                        res->end - res->start);
+                uart->port.membase = ioremap(res->start, resource_size(res));
                 if (!uart->port.membase) {
                         dev_err(&pdev->dev, "Cannot map uart IO\n");
                         ret = -ENXIO;
@@ -1483,7 +1482,7 @@ static int bfin_earlyprintk_probe(struct platform_device *pdev)
         }
 
         bfin_earlyprintk_port.port.membase = ioremap(res->start,
-                        res->end - res->start);
+                                                     resource_size(res));
         if (!bfin_earlyprintk_port.port.membase) {
                 dev_err(&pdev->dev, "Cannot map uart IO\n");
                 ret = -ENXIO;
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index a54473123e0a..22fe801cce31 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -954,7 +954,7 @@ static void imx_release_port(struct uart_port *port)
         struct resource *mmres;
 
         mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(mmres->start, mmres->end - mmres->start + 1);
+        release_mem_region(mmres->start, resource_size(mmres));
 }
 
 /*
@@ -970,8 +970,7 @@ static int imx_request_port(struct uart_port *port)
         if (!mmres)
                 return -ENODEV;
 
-        ret = request_mem_region(mmres->start, mmres->end - mmres->start + 1,
-                        "imx-uart");
+        ret = request_mem_region(mmres->start, resource_size(mmres), "imx-uart");
 
         return  ret ? 0 : -EBUSY;
 }
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
index 84db7321cce8..8e07517f8acd 100644
--- a/drivers/tty/serial/m32r_sio.c
+++ b/drivers/tty/serial/m32r_sio.c
@@ -892,7 +892,7 @@ static int m32r_sio_request_port(struct uart_port *port)
          * If we have a mapbase, then request that as well.
          */
         if (ret == 0 && up->port.flags & UPF_IOREMAP) {
-                int size = res->end - res->start + 1;
+                int size = resource_size(res);
 
                 up->port.membase = ioremap(up->port.mapbase, size);
                 if (!up->port.membase)
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 47cadf474149..c37df8d0fa28 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1241,8 +1241,8 @@ static int serial_omap_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        if (!request_mem_region(mem->start, (mem->end - mem->start) + 1,
-                                     pdev->dev.driver->name)) {
+        if (!request_mem_region(mem->start, resource_size(mem),
+                                pdev->dev.driver->name)) {
                 dev_err(&pdev->dev, "memory region already claimed\n");
                 return -EBUSY;
         }
@@ -1308,7 +1308,7 @@ err:
         dev_err(&pdev->dev, "[UART%d]: failure [%s]: %d\n",
                                 pdev->id, __func__, ret);
 do_release_region:
-        release_mem_region(mem->start, (mem->end - mem->start) + 1);
+        release_mem_region(mem->start, resource_size(mem));
         return ret;
 }
 
diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index 4302e6e3768e..531931c1b250 100644
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
@@ -803,7 +803,7 @@ static int serial_pxa_probe(struct platform_device *dev)
                 break;
         }
 
-        sport->port.membase = ioremap(mmres->start, mmres->end - mmres->start + 1);
+        sport->port.membase = ioremap(mmres->start, resource_size(mmres));
         if (!sport->port.membase) {
                 ret = -ENOMEM;
                 goto err_clk;
diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c
index 92aa54550e84..ad0f8f5f6ea1 100644
--- a/drivers/tty/serial/sunsu.c
+++ b/drivers/tty/serial/sunsu.c
@@ -1435,7 +1435,7 @@ static int __devinit su_probe(struct platform_device *op)
 
         rp = &op->resource[0];
         up->port.mapbase = rp->start;
-        up->reg_size = (rp->end - rp->start) + 1;
+        up->reg_size = resource_size(rp);
         up->port.membase = of_ioremap(rp, 0, up->reg_size, "su");
         if (!up->port.membase) {
                 if (type != SU_PORT_PORT)
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c
index 37fc4e3d487c..026cb9ea5cd1 100644
--- a/drivers/tty/serial/vt8500_serial.c
+++ b/drivers/tty/serial/vt8500_serial.c
@@ -573,8 +573,7 @@ static int __init vt8500_serial_probe(struct platform_device *pdev)
         snprintf(vt8500_port->name, sizeof(vt8500_port->name),
                  "VT8500 UART%d", pdev->id);
 
-        vt8500_port->uart.membase = ioremap(mmres->start,
-                                            mmres->end - mmres->start + 1);
+        vt8500_port->uart.membase = ioremap(mmres->start, resource_size(mmres));
         if (!vt8500_port->uart.membase) {
                 ret = -ENOMEM;
                 goto err;