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)

4 files changed, 11 insertions, 12 deletions

diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index fb33fa42d249..4902206f53d9 100644
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -283,8 +283,7 @@ static int __init at91_cf_probe(struct platform_device *pdev)
         }
 
         /* reserve chip-select regions */
-        if (!request_mem_region(io->start, io->end + 1 - io->start,
-                                driver_name)) {
+        if (!request_mem_region(io->start, resource_size(io), driver_name)) {
                 status = -ENXIO;
                 goto fail1;
         }
@@ -308,7 +307,7 @@ static int __init at91_cf_probe(struct platform_device *pdev)
         return 0;
 
 fail2:
-        release_mem_region(io->start, io->end + 1 - io->start);
+        release_mem_region(io->start, resource_size(io));
 fail1:
         if (cf->socket.io_offset)
                 iounmap((void __iomem *) cf->socket.io_offset);
@@ -339,7 +338,7 @@ static int __exit at91_cf_remove(struct platform_device *pdev)
         struct resource         *io = cf->socket.io[0].res;
 
         pcmcia_unregister_socket(&cf->socket);
-        release_mem_region(io->start, io->end + 1 - io->start);
+        release_mem_region(io->start, resource_size(io));
         iounmap((void __iomem *) cf->socket.io_offset);
         if (board->irq_pin) {
                 free_irq(board->irq_pin, cf);
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c
index 6defd4a8168e..06ad3e5e7d3d 100644
--- a/drivers/pcmcia/electra_cf.c
+++ b/drivers/pcmcia/electra_cf.c
@@ -209,9 +209,9 @@ static int __devinit electra_cf_probe(struct platform_device *ofdev)
 
         cf->ofdev = ofdev;
         cf->mem_phys = mem.start;
-        cf->mem_size = PAGE_ALIGN(mem.end - mem.start);
+        cf->mem_size = PAGE_ALIGN(resource_size(&mem));
         cf->mem_base = ioremap(cf->mem_phys, cf->mem_size);
-        cf->io_size = PAGE_ALIGN(io.end - io.start);
+        cf->io_size = PAGE_ALIGN(resource_size(&io));
 
         area = __get_vm_area(cf->io_size, 0, PHB_IO_BASE, PHB_IO_END);
         if (area == NULL)
diff --git a/drivers/pcmcia/rsrc_iodyn.c b/drivers/pcmcia/rsrc_iodyn.c
index 523eb691c30b..f53c237bda2f 100644
--- a/drivers/pcmcia/rsrc_iodyn.c
+++ b/drivers/pcmcia/rsrc_iodyn.c
@@ -135,7 +135,7 @@ static int iodyn_find_io(struct pcmcia_socket *s, unsigned int attr,
                 try = res->end + 1;
                 if ((*base == 0) || (*base == try)) {
                         if (adjust_resource(s->io[i].res, res->start,
-                                        res->end - res->start + num + 1))
+                                            resource_size(res) + num))
                                 continue;
                         *base = try;
                         s->io[i].InUse += num;
@@ -147,8 +147,8 @@ static int iodyn_find_io(struct pcmcia_socket *s, unsigned int attr,
                 try = res->start - num;
                 if ((*base == 0) || (*base == try)) {
                         if (adjust_resource(s->io[i].res,
-                                        res->start - num,
-                                        res->end - res->start + num + 1))
+                                            res->start - num,
+                                            resource_size(res) + num))
                                 continue;
                         *base = try;
                         s->io[i].InUse += num;
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index b187555d4388..9da9656242af 100644
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -770,7 +770,7 @@ static int nonstatic_find_io(struct pcmcia_socket *s, unsigned int attr,
                                                         res->end + num);
                         if (!ret) {
                                 ret = adjust_resource(s->io[i].res, res->start,
-                                               res->end - res->start + num + 1);
+                                                      resource_size(res) + num);
                                 if (ret)
                                         continue;
                                 *base = try;
@@ -788,8 +788,8 @@ static int nonstatic_find_io(struct pcmcia_socket *s, unsigned int attr,
                                                         res->end);
                         if (!ret) {
                                 ret = adjust_resource(s->io[i].res,
-                                               res->start - num,
-                                               res->end - res->start + num + 1);
+                                                      res->start - num,
+                                                      resource_size(res) + num);
                                 if (ret)
                                         continue;
                                 *base = try;