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)

1 files changed, 4 insertions, 5 deletions

diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c
index 3ff8cc5f487a..010658335881 100644
--- a/sound/aoa/soundbus/i2sbus/core.c
+++ b/sound/aoa/soundbus/i2sbus/core.c
@@ -262,8 +262,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,
                  */
                 dev->allocated_resource[i] =
                         request_mem_region(dev->resources[i].start,
-                                           dev->resources[i].end -
-                                           dev->resources[i].start + 1,
+                                           resource_size(&dev->resources[i]),
                                            dev->rnames[i]);
                 if (!dev->allocated_resource[i]) {
                         printk(KERN_ERR "i2sbus: failed to claim resource %d!\n", i);
@@ -272,19 +271,19 @@ static int i2sbus_add_dev(struct macio_dev *macio,
         }
 
         r = &dev->resources[aoa_resource_i2smmio];
-        rlen = r->end - r->start + 1;
+        rlen = resource_size(r);
         if (rlen < sizeof(struct i2s_interface_regs))
                 goto err;
         dev->intfregs = ioremap(r->start, rlen);
 
         r = &dev->resources[aoa_resource_txdbdma];
-        rlen = r->end - r->start + 1;
+        rlen = resource_size(r);
         if (rlen < sizeof(struct dbdma_regs))
                 goto err;
         dev->out.dbdma = ioremap(r->start, rlen);
 
         r = &dev->resources[aoa_resource_rxdbdma];
-        rlen = r->end - r->start + 1;
+        rlen = resource_size(r);
         if (rlen < sizeof(struct dbdma_regs))
                 goto err;
         dev->in.dbdma = ioremap(r->start, rlen);