diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2008-12-15 12:58:29 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 10:44:34 -0800 |
| commit | 035da16fb529c0383ac27c712a5bbade5c11cafe (patch) | |
| tree | 72fa6626ceba7763ac4fcb35e48724b27c4d0d6d /net/iucv | |
| parent | ff8561c4ad09ca38c866436c9d67df2309b7dd40 (diff) | |
| download | op-kernel-dev-035da16fb529c0383ac27c712a5bbade5c11cafe.zip op-kernel-dev-035da16fb529c0383ac27c712a5bbade5c11cafe.tar.gz | |
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>
Diffstat (limited to 'net/iucv')
| -rw-r--r-- | net/iucv/iucv.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c index 032f61e..a35240f 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); } |
