[WATCHDOG] use resource_size()

Use resource_size().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Kevin Hilman <khilman@ti.deeprootsystems.com>
Cc: Ulrik Bech Hald <ubh@ti.com>
Cc: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Ming Lei <tom.leiming@gmail.com>
Cc: Vincent Sanders <support@simtec.co.uk>
Acked-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

9 files changed, 14 insertions, 17 deletions

diff --git a/drivers/watchdog/adx_wdt.c b/drivers/watchdog/adx_wdt.c
index 9c6594473d3b..9d7d155364f8 100644
--- a/drivers/watchdog/adx_wdt.c
+++ b/drivers/watchdog/adx_wdt.c
@@ -242,14 +242,14 @@ static int __devinit adx_wdt_probe(struct platform_device *pdev)
         }
 
         res = devm_request_mem_region(&pdev->dev, res->start,
-                        res->end - res->start + 1, res->name);
+                        resource_size(res), res->name);
         if (!res) {
                 dev_err(&pdev->dev, "cannot request I/O memory region\n");
                 return -ENXIO;
         }
 
         wdt->base = devm_ioremap_nocache(&pdev->dev, res->start,
-                        res->end - res->start + 1);
+                        resource_size(res));
         if (!wdt->base) {
                 dev_err(&pdev->dev, "cannot remap I/O memory region\n");
                 return -ENXIO;
diff --git a/drivers/watchdog/at32ap700x_wdt.c b/drivers/watchdog/at32ap700x_wdt.c
index e8ae638e5804..037847923dcb 100644
--- a/drivers/watchdog/at32ap700x_wdt.c
+++ b/drivers/watchdog/at32ap700x_wdt.c
@@ -326,7 +326,7 @@ static int __init at32_wdt_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
-        wdt->regs = ioremap(regs->start, regs->end - regs->start + 1);
+        wdt->regs = ioremap(regs->start, resource_size(regs));
         if (!wdt->regs) {
                 ret = -ENOMEM;
                 dev_dbg(&pdev->dev, "could not map I/O memory\n");
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index 9d7520fa9e9c..887136de1857 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -221,7 +221,7 @@ static int __devinit davinci_wdt_probe(struct platform_device *pdev)
                 return -ENOENT;
         }
 
-        size = res->end - res->start + 1;
+        size = resource_size(res);
         wdt_mem = request_mem_region(res->start, size, pdev->name);
 
         if (wdt_mem == NULL) {
diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c
index 83fa34b214b4..a2dc07c2ed49 100644
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
@@ -350,7 +350,7 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev)
                 ret = -ENXIO;
                 goto err_free;
         }
-        wdt->base = ioremap(res->start, res->end - res->start + 1);
+        wdt->base = ioremap(res->start, resource_size(res));
         if (!wdt->base) {
                 ret = -ENOMEM;
                 goto err_free;
diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c
index acf589dc057c..a51dbe4c43da 100644
--- a/drivers/watchdog/mv64x60_wdt.c
+++ b/drivers/watchdog/mv64x60_wdt.c
@@ -275,7 +275,7 @@ static int __devinit mv64x60_wdt_probe(struct platform_device *dev)
         if (!r)
                 return -ENODEV;
 
-        mv64x60_wdt_regs = ioremap(r->start, r->end - r->start + 1);
+        mv64x60_wdt_regs = ioremap(r->start, resource_size(r));
         if (mv64x60_wdt_regs == NULL)
                 return -ENOMEM;
 
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 429ea99eaee5..c6aaf2845741 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -277,8 +277,7 @@ static int __devinit omap_wdt_probe(struct platform_device *pdev)
                 goto err_busy;
         }
 
-        mem = request_mem_region(res->start, res->end - res->start + 1,
-                                 pdev->name);
+        mem = request_mem_region(res->start, resource_size(res), pdev->name);
         if (!mem) {
                 ret = -EBUSY;
                 goto err_busy;
@@ -306,7 +305,7 @@ static int __devinit omap_wdt_probe(struct platform_device *pdev)
                 goto err_clk;
         }
 
-        wdev->base = ioremap(res->start, res->end - res->start + 1);
+        wdev->base = ioremap(res->start, resource_size(res));
         if (!wdev->base) {
                 ret = -ENOMEM;
                 goto err_ioremap;
@@ -358,7 +357,7 @@ err_clk:
         kfree(wdev);
 
 err_kzalloc:
-        release_mem_region(res->start, res->end - res->start + 1);
+        release_mem_region(res->start, resource_size(res));
 
 err_busy:
 err_get_resource:
@@ -383,7 +382,7 @@ static int __devexit omap_wdt_remove(struct platform_device *pdev)
                 return -ENOENT;
 
         misc_deregister(&(wdev->omap_wdt_miscdev));
-        release_mem_region(res->start, res->end - res->start + 1);
+        release_mem_region(res->start, resource_size(res));
         platform_set_drvdata(pdev, NULL);
 
         clk_put(wdev->ick);
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index 4d227b152001..430a5848a9a5 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -264,7 +264,7 @@ static int __devinit pnx4008_wdt_probe(struct platform_device *pdev)
                 return -ENOENT;
         }
 
-        size = res->end - res->start + 1;
+        size = resource_size(res);
         wdt_mem = request_mem_region(res->start, size, pdev->name);
 
         if (wdt_mem == NULL) {
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 85b93e15d011..8760a26ab2a3 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -421,7 +421,7 @@ static int __devinit s3c2410wdt_probe(struct platform_device *pdev)
                 return -ENOENT;
         }
 
-        size = (res->end - res->start) + 1;
+        size = resource_size(res);
         wdt_mem = request_mem_region(res->start, size, pdev->name);
         if (wdt_mem == NULL) {
                 dev_err(dev, "failed to get memory region\n");
diff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c
index 6adab77fbbb0..d635566e9307 100644
--- a/drivers/watchdog/txx9wdt.c
+++ b/drivers/watchdog/txx9wdt.c
@@ -214,12 +214,10 @@ static int __init txx9wdt_probe(struct platform_device *dev)
         res = platform_get_resource(dev, IORESOURCE_MEM, 0);
         if (!res)
                 goto exit_busy;
-        if (!devm_request_mem_region(&dev->dev,
-                                     res->start, res->end - res->start + 1,
+        if (!devm_request_mem_region(&dev->dev, res->start, resource_size(res),
                                      "txx9wdt"))
                 goto exit_busy;
-        txx9wdt_reg = devm_ioremap(&dev->dev,
-                                   res->start, res->end - res->start + 1);
+        txx9wdt_reg = devm_ioremap(&dev->dev, res->start, resource_size(res));
         if (!txx9wdt_reg)
                 goto exit_busy;