aboutsummaryrefslogtreecommitdiffstats
path: root/net/iucv
diff options
context:
space:
mode:
Diffstat (limited to 'net/iucv')
-rw-r--r--net/iucv/iucv.c7
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 @@
50#include <asm/ebcdic.h> 50#include <asm/ebcdic.h>
51#include <asm/io.h> 51#include <asm/io.h>
52#include <asm/s390_ext.h> 52#include <asm/s390_ext.h>
53#include <asm/s390_rdev.h>
54#include <asm/smp.h> 53#include <asm/smp.h>
55 54
56/* 55/*
@@ -1696,7 +1695,7 @@ static int __init iucv_init(void)
1696 rc = register_external_interrupt(0x4000, iucv_external_interrupt); 1695 rc = register_external_interrupt(0x4000, iucv_external_interrupt);
1697 if (rc) 1696 if (rc)
1698 goto out; 1697 goto out;
1699 iucv_root = s390_root_dev_register("iucv"); 1698 iucv_root = root_device_register("iucv");
1700 if (IS_ERR(iucv_root)) { 1699 if (IS_ERR(iucv_root)) {
1701 rc = PTR_ERR(iucv_root); 1700 rc = PTR_ERR(iucv_root);
1702 goto out_int; 1701 goto out_int;
@@ -1740,7 +1739,7 @@ out_free:
1740 kfree(iucv_irq_data[cpu]); 1739 kfree(iucv_irq_data[cpu]);
1741 iucv_irq_data[cpu] = NULL; 1740 iucv_irq_data[cpu] = NULL;
1742 } 1741 }
1743 s390_root_dev_unregister(iucv_root); 1742 root_device_unregister(iucv_root);
1744out_int: 1743out_int:
1745 unregister_external_interrupt(0x4000, iucv_external_interrupt); 1744 unregister_external_interrupt(0x4000, iucv_external_interrupt);
1746out: 1745out:
@@ -1770,7 +1769,7 @@ static void __exit iucv_exit(void)
1770 kfree(iucv_irq_data[cpu]); 1769 kfree(iucv_irq_data[cpu]);
1771 iucv_irq_data[cpu] = NULL; 1770 iucv_irq_data[cpu] = NULL;
1772 } 1771 }
1773 s390_root_dev_unregister(iucv_root); 1772 root_device_unregister(iucv_root);
1774 bus_unregister(&iucv_bus); 1773 bus_unregister(&iucv_bus);
1775 unregister_external_interrupt(0x4000, iucv_external_interrupt); 1774 unregister_external_interrupt(0x4000, iucv_external_interrupt);
1776} 1775}