aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWingMan Kwok <w-kwok2@ti.com>2012-08-07 17:38:29 -0400
committerCyril Chemparathy <cyril@ti.com>2012-09-21 10:44:15 -0400
commit349829da60edc631f45fc9de427641e88ef78c4d (patch)
tree86fe4610564600df7a656565b956b9cdf5daf6c3
parentb8b521f7e75f74f6baabc788186efa5e3ca6ff7d (diff)
downloadlinux-keystone-349829da60edc631f45fc9de427641e88ef78c4d.tar.gz
rapidio: remove rio_init_mports from system initcall
Call rio_init_mports in rio_register_mport. Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
-rw-r--r--drivers/rapidio/rio.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c
index c40665a4fa3347..06163c2d10ecc6 100644
--- a/drivers/rapidio/rio.c
+++ b/drivers/rapidio/rio.c
@@ -1206,7 +1206,7 @@ static void rio_fixup_device(struct rio_dev *dev)
{
}
-static int __devinit rio_init(void)
+static int rio_init(void)
{
struct rio_dev *dev = NULL;
@@ -1216,7 +1216,7 @@ static int __devinit rio_init(void)
return 0;
}
-int __devinit rio_init_mports(void)
+int rio_init_mports(void)
{
struct rio_mport *port;
@@ -1232,8 +1232,6 @@ int __devinit rio_init_mports(void)
return 0;
}
-device_initcall_sync(rio_init_mports);
-
static int hdids[RIO_MAX_MPORTS + 1];
static int rio_get_hdid(int index)
@@ -1262,6 +1260,7 @@ int rio_register_mport(struct rio_mport *port)
port->id = next_portid++;
port->host_deviceid = rio_get_hdid(port->id);
list_add_tail(&port->node, &rio_mports);
+ rio_init_mports();
return 0;
}