[PATCH] S390: Replace deprecated "__initcall" with equivalent "device_initcall".

["Robert P. J. Day" <rpjday@xxxxxxxxxxxxxx>]

Signed-off-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx>

---

 drivers/s390/char/sclp_config.c  |    2 +-
 drivers/s390/char/sclp_cpi_sys.c |    2 +-
 drivers/s390/char/sclp_vt220.c   |    2 +-
 drivers/s390/cio/blacklist.c     |    2 +-
 drivers/s390/sysinfo.c           |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/s390/char/sclp_config.c b/drivers/s390/char/sclp_config.c
index 9e784d5..e0a71b4 100644
--- a/drivers/s390/char/sclp_config.c
+++ b/drivers/s390/char/sclp_config.c
@@ -87,4 +87,4 @@ static int __init sclp_conf_init(void)
 	return rc;
 }

-__initcall(sclp_conf_init);
+device_initcall(sclp_conf_init);
diff --git a/drivers/s390/char/sclp_cpi_sys.c b/drivers/s390/char/sclp_cpi_sys.c
index 9f37456..7430484 100644
--- a/drivers/s390/char/sclp_cpi_sys.c
+++ b/drivers/s390/char/sclp_cpi_sys.c
@@ -397,4 +397,4 @@ static int __init cpi_init(void)
 	return rc;
 }

-__initcall(cpi_init);
+device_initcall(cpi_init);
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
index 35707c0..7147a00 100644
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
@@ -742,7 +742,7 @@ out_driver:
 	put_tty_driver(driver);
 	return rc;
 }
-__initcall(sclp_vt220_tty_init);
+device_initcall(sclp_vt220_tty_init);

 #ifdef CONFIG_SCLP_VT220_CONSOLE

diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index 9c21b8f..1367a7a 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -396,6 +396,6 @@ cio_ignore_proc_init (void)
 	return 0;
 }

-__initcall (cio_ignore_proc_init);
+device_initcall(cio_ignore_proc_init);

 #endif /* CONFIG_PROC_FS */
diff --git a/drivers/s390/sysinfo.c b/drivers/s390/sysinfo.c
index c3e4ab0..54ee3b5 100644
--- a/drivers/s390/sysinfo.c
+++ b/drivers/s390/sysinfo.c
@@ -269,7 +269,7 @@ static __init int create_proc_sysinfo(void)
 	return 0;
 }

-__initcall(create_proc_sysinfo);
+device_initcall(create_proc_sysinfo);

 int get_cpu_capability(unsigned int *capability)
 {

========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry:
    Have classroom, will lecture.

http://crashcourse.ca                          Waterloo, Ontario, CANADA
========================================================================
--
To unsubscribe from this list: send the line "unsubscribe linux-s390" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html