rapidio: remove mport resource reservation from common RIO code

Removes resource reservation from the common sybsystem initialization code
and make it part of mport driver initialization.  This resolves conflict
with resource reservation by device specific mport drivers.

Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Li Yang <leoli@freescale.com>
Cc: Thomas Moll <thomas.moll@sysgo.com>
Cc: Micha Nelissen <micha@neli.hopto.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 1 insertions, 13 deletions

diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index 9a7b2168d1d5..c29719cacbca 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -1137,20 +1137,9 @@ static int __devinit rio_init(void)
 
 int __devinit rio_init_mports(void)
 {
-        int rc = 0;
         struct rio_mport *port;
 
         list_for_each_entry(port, &rio_mports, node) {
-                if (!request_mem_region(port->iores.start,
-                                        resource_size(&port->iores),
-                                        port->name)) {
-                        printk(KERN_ERR
-                               "RIO: Error requesting master port region 0x%016llx-0x%016llx\n",
-                               (u64)port->iores.start, (u64)port->iores.end);
-                        rc = -ENOMEM;
-                        goto out;
-                }
-
                 if (port->host_deviceid >= 0)
                         rio_enum_mport(port);
                 else
@@ -1159,8 +1148,7 @@ int __devinit rio_init_mports(void)
 
         rio_init();
 
-      out:
-        return rc;
+        return 0;
 }
 
 device_initcall_sync(rio_init_mports);