powerpc/fsl_rio: changes to mport registration

Change mport object initialization/registration sequence to match
reworked version of rio_register_mport() in the core code.

Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: Andre van Herk <andre.van.herk@prodrive-technologies.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index c1cd3698f534eea2e3abc728798151ed184200bd..385371acc0d03a7dfa529e3aac9e0f4bf1971ad6 100644 (file)
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -606,6 +606,12 @@ int fsl_rio_setup(struct platform_device *dev)
                if (!port)
                        continue;
 
+               rc = rio_mport_initialize(port);
+               if (rc) {
+                       kfree(port);
+                       continue;
+               }
+
                i = *port_index - 1;
                port->index = (unsigned char)i;
 
@@ -682,12 +688,6 @@ int fsl_rio_setup(struct platform_device *dev)
                dev_info(&dev->dev, "RapidIO Common Transport System size: %d\n",
                                port->sys_size ? 65536 : 256);
 
-               if (rio_register_mport(port)) {
-                       release_resource(&port->iores);
-                       kfree(priv);
-                       kfree(port);
-                       continue;
-               }
                if (port->host_deviceid >= 0)
                        out_be32(priv->regs_win + RIO_GCCSR, RIO_PORT_GEN_HOST |
                                RIO_PORT_GEN_MASTER | RIO_PORT_GEN_DISCOVERED);
@@ -727,6 +727,12 @@ int fsl_rio_setup(struct platform_device *dev)
 
                dbell->mport[i] = port;
 
+               if (rio_register_mport(port)) {
+                       release_resource(&port->iores);
+                       kfree(priv);
+                       kfree(port);
+                       continue;
+               }
                active_ports++;
        }