Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)

10 files changed, 15 insertions, 18 deletions

diff --git a/drivers/rtc/rtc-at32ap700x.c b/drivers/rtc/rtc-at32ap700x.c
index e725d51e773d..8dd08305aae1 100644
--- a/drivers/rtc/rtc-at32ap700x.c
+++ b/drivers/rtc/rtc-at32ap700x.c
@@ -223,7 +223,7 @@ static int __init at32_rtc_probe(struct platform_device *pdev)
         }
 
         rtc->irq = irq;
-        rtc->regs = ioremap(regs->start, regs->end - regs->start + 1);
+        rtc->regs = ioremap(regs->start, resource_size(regs));
         if (!rtc->regs) {
                 ret = -ENOMEM;
                 dev_dbg(&pdev->dev, "could not map I/O memory\n");
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 911e75cdc125..05beb6c1ca79 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -606,7 +606,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
          * (needing ioremap etc), not i/o space resources like this ...
          */
         ports = request_region(ports->start,
-                        ports->end + 1 - ports->start,
+                        resource_size(ports),
                         driver_name);
         if (!ports) {
                 dev_dbg(dev, "i/o registers already in use\n");
@@ -750,7 +750,7 @@ cleanup1:
         cmos_rtc.dev = NULL;
         rtc_device_unregister(cmos_rtc.rtc);
 cleanup0:
-        release_region(ports->start, ports->end + 1 - ports->start);
+        release_region(ports->start, resource_size(ports));
         return retval;
 }
 
@@ -779,7 +779,7 @@ static void __exit cmos_do_remove(struct device *dev)
         cmos->rtc = NULL;
 
         ports = cmos->iomem;
-        release_region(ports->start, ports->end + 1 - ports->start);
+        release_region(ports->start, resource_size(ports));
         cmos->iomem = NULL;
 
         cmos->dev = NULL;
diff --git a/drivers/rtc/rtc-ds1286.c b/drivers/rtc/rtc-ds1286.c
index 47e681df31e2..68e6caf25496 100644
--- a/drivers/rtc/rtc-ds1286.c
+++ b/drivers/rtc/rtc-ds1286.c
@@ -343,7 +343,7 @@ static int __devinit ds1286_probe(struct platform_device *pdev)
         if (!priv)
                 return -ENOMEM;
 
-        priv->size = res->end - res->start + 1;
+        priv->size = resource_size(res);
         if (!request_mem_region(res->start, priv->size, pdev->name)) {
                 ret = -EBUSY;
                 goto out;
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index fbabc773dded..568ad30617e7 100644
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -490,7 +490,7 @@ ds1511_rtc_probe(struct platform_device *pdev)
         pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
         if (!pdata)
                 return -ENOMEM;
-        pdata->size = res->end - res->start + 1;
+        pdata->size = resource_size(res);
         if (!devm_request_mem_region(&pdev->dev, res->start, pdata->size,
                         pdev->name))
                 return -EBUSY;
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index 042630c90dd3..d84a448dd754 100644
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -173,7 +173,7 @@ static int __devinit ds1742_rtc_probe(struct platform_device *pdev)
         pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
         if (!pdata)
                 return -ENOMEM;
-        pdata->size = res->end - res->start + 1;
+        pdata->size = resource_size(res);
         if (!devm_request_mem_region(&pdev->dev, res->start, pdata->size,
                 pdev->name))
                 return -EBUSY;
diff --git a/drivers/rtc/rtc-m48t35.c b/drivers/rtc/rtc-m48t35.c
index 7410875e5838..8e2a24e33ed6 100644
--- a/drivers/rtc/rtc-m48t35.c
+++ b/drivers/rtc/rtc-m48t35.c
@@ -154,7 +154,7 @@ static int __devinit m48t35_probe(struct platform_device *pdev)
         if (!priv)
                 return -ENOMEM;
 
-        priv->size = res->end - res->start + 1;
+        priv->size = resource_size(res);
         /*
          * kludge: remove the #ifndef after ioc3 resource
          * conflicts are resolved
diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
index 3978f4caf724..28365388fb6c 100644
--- a/drivers/rtc/rtc-m48t59.c
+++ b/drivers/rtc/rtc-m48t59.c
@@ -433,7 +433,7 @@ static int __devinit m48t59_rtc_probe(struct platform_device *pdev)
 
         if (!m48t59->ioaddr) {
                 /* ioaddr not mapped externally */
-                m48t59->ioaddr = ioremap(res->start, res->end - res->start + 1);
+                m48t59->ioaddr = ioremap(res->start, resource_size(res));
                 if (!m48t59->ioaddr)
                         goto out;
         }
diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
index 0cec5650d56a..d33544802a2e 100644
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
@@ -332,9 +332,8 @@ vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq)
         if (!iomem)
                 return -ENODEV;
 
-        iomem = request_mem_region(iomem->start,
-                        iomem->end + 1 - iomem->start,
-                        driver_name);
+        iomem = request_mem_region(iomem->start, resource_size(iomem),
+                                   driver_name);
         if (!iomem) {
                 dev_dbg(dev, "i/o mem already in use.\n");
                 return -EBUSY;
diff --git a/drivers/rtc/rtc-puv3.c b/drivers/rtc/rtc-puv3.c
index 46f14b82f3ab..b3eba3cddd42 100644
--- a/drivers/rtc/rtc-puv3.c
+++ b/drivers/rtc/rtc-puv3.c
@@ -267,9 +267,8 @@ static int puv3_rtc_probe(struct platform_device *pdev)
                 return -ENOENT;
         }
 
-        puv3_rtc_mem = request_mem_region(res->start,
-                                         res->end-res->start+1,
-                                         pdev->name);
+        puv3_rtc_mem = request_mem_region(res->start, resource_size(res),
+                                          pdev->name);
 
         if (puv3_rtc_mem == NULL) {
                 dev_err(&pdev->dev, "failed to reserve memory region\n");
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 16512ecae31a..2a65e85e0f56 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -455,8 +455,7 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
                 return -ENOENT;
         }
 
-        s3c_rtc_mem = request_mem_region(res->start,
-                                         res->end-res->start+1,
+        s3c_rtc_mem = request_mem_region(res->start, resource_size(res),
                                          pdev->name);
 
         if (s3c_rtc_mem == NULL) {
@@ -465,7 +464,7 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
                 goto err_nores;
         }
 
-        s3c_rtc_base = ioremap(res->start, res->end - res->start + 1);
+        s3c_rtc_base = ioremap(res->start, resource_size(res));
         if (s3c_rtc_base == NULL) {
                 dev_err(&pdev->dev, "failed ioremap()\n");
                 ret = -EINVAL;