s390: remove s390_root_dev_*()

Replace s390_root_dev_register() with root_device_register() etc.

[Includes fix from Cornelia Huck]

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 3 insertions, 4 deletions

diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 032f61e98595..a35240f61ec3 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -50,7 +50,6 @@
 #include <asm/ebcdic.h>
 #include <asm/io.h>
 #include <asm/s390_ext.h>
-#include <asm/s390_rdev.h>
 #include <asm/smp.h>
 
 /*
@@ -1696,7 +1695,7 @@ static int __init iucv_init(void)
         rc = register_external_interrupt(0x4000, iucv_external_interrupt);
         if (rc)
                 goto out;
-        iucv_root = s390_root_dev_register("iucv");
+        iucv_root = root_device_register("iucv");
         if (IS_ERR(iucv_root)) {
                 rc = PTR_ERR(iucv_root);
                 goto out_int;
@@ -1740,7 +1739,7 @@ out_free:
                 kfree(iucv_irq_data[cpu]);
                 iucv_irq_data[cpu] = NULL;
         }
-        s390_root_dev_unregister(iucv_root);
+        root_device_unregister(iucv_root);
 out_int:
         unregister_external_interrupt(0x4000, iucv_external_interrupt);
 out:
@@ -1770,7 +1769,7 @@ static void __exit iucv_exit(void)
                 kfree(iucv_irq_data[cpu]);
                 iucv_irq_data[cpu] = NULL;
         }
-        s390_root_dev_unregister(iucv_root);
+        root_device_unregister(iucv_root);
         bus_unregister(&iucv_bus);
         unregister_external_interrupt(0x4000, iucv_external_interrupt);
 }