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)

3 files changed, 6 insertions, 6 deletions

diff --git a/arch/powerpc/platforms/cell/celleb_scc_epci.c b/arch/powerpc/platforms/cell/celleb_scc_epci.c
index 05b0db3ef638..844c0facb4f7 100644
--- a/arch/powerpc/platforms/cell/celleb_scc_epci.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_epci.c
@@ -393,19 +393,19 @@ static int __init celleb_setup_epci(struct device_node *node,
 
         if (of_address_to_resource(node, 0, &r))
                 goto error;
-        hose->cfg_addr = ioremap(r.start, (r.end - r.start + 1));
+        hose->cfg_addr = ioremap(r.start, resource_size(&r));
         if (!hose->cfg_addr)
                 goto error;
         pr_debug("EPCI: cfg_addr map 0x%016llx->0x%016lx + 0x%016llx\n",
-                 r.start, (unsigned long)hose->cfg_addr, (r.end - r.start + 1));
+                 r.start, (unsigned long)hose->cfg_addr, resource_size(&r));
 
         if (of_address_to_resource(node, 2, &r))
                 goto error;
-        hose->cfg_data = ioremap(r.start, (r.end - r.start + 1));
+        hose->cfg_data = ioremap(r.start, resource_size(&r));
         if (!hose->cfg_data)
                 goto error;
         pr_debug("EPCI: cfg_data map 0x%016llx->0x%016lx + 0x%016llx\n",
-                 r.start, (unsigned long)hose->cfg_data, (r.end - r.start + 1));
+                 r.start, (unsigned long)hose->cfg_data, resource_size(&r));
 
         hose->ops = &celleb_epci_ops;
         celleb_epci_init(hose);
diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
index a881bbee8de0..ae790ac4a589 100644
--- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
@@ -494,7 +494,7 @@ static __init int celleb_setup_pciex(struct device_node *node,
                 pr_err("PCIEXC:Failed to get config resource.\n");
                 return 1;
         }
-        phb->cfg_addr = ioremap(r.start, r.end - r.start + 1);
+        phb->cfg_addr = ioremap(r.start, resource_size(&r));
         if (!phb->cfg_addr) {
                 pr_err("PCIEXC:Failed to remap SMMIO region.\n");
                 return 1;
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index f465d474ad9b..4e5c91489c02 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -222,7 +222,7 @@ static int spu_map_resource(struct spu *spu, int nr,
                 return ret;
         if (phys)
                 *phys = resource.start;
-        len = resource.end - resource.start + 1;
+        len = resource_size(&resource);
         *virt = ioremap(resource.start, len);
         if (!*virt)
                 return -EINVAL;