summaryrefslogtreecommitdiffstats
path: root/drivers/rapidio
diff options
context:
space:
mode:
authorAlexandre Bounine <alexandre.bounine@idt.com>2011-03-23 16:43:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-23 19:46:42 -0700
commit2f809985d2cbc78078b8da1cbed1f1ce1f4a0d5f (patch)
tree6ce67e43f25700ca08f84e4a87b74c0be0d7ee7f /drivers/rapidio
parent388b78adc9899f0299128610f566051d0b1a57f6 (diff)
downloadlinux-stable-2f809985d2cbc78078b8da1cbed1f1ce1f4a0d5f.tar.gz
linux-stable-2f809985d2cbc78078b8da1cbed1f1ce1f4a0d5f.tar.bz2
linux-stable-2f809985d2cbc78078b8da1cbed1f1ce1f4a0d5f.zip
rapidio: modify subsystem and driver initialization sequence
Subsystem initialization sequence modified to support presence of multiple RapidIO controllers in the system. The new sequence is compatible with initialization of PCI devices. 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>
Diffstat (limited to 'drivers/rapidio')
-rw-r--r--drivers/rapidio/rio.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index d520dbaede80..f861b728f80e 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -1134,8 +1134,6 @@ static int __devinit rio_init(void)
return 0;
}
-device_initcall(rio_init);
-
int __devinit rio_init_mports(void)
{
int rc = 0;
@@ -1158,10 +1156,14 @@ int __devinit rio_init_mports(void)
rio_disc_mport(port);
}
+ rio_init();
+
out:
return rc;
}
+device_initcall_sync(rio_init_mports);
+
void rio_register_mport(struct rio_mport *port)
{
list_add_tail(&port->node, &rio_mports);