diff options
-rw-r--r-- | drivers/s390/char/sclp.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c index e65572e504ba..b76c61f82485 100644 --- a/drivers/s390/char/sclp.c +++ b/drivers/s390/char/sclp.c | |||
@@ -27,9 +27,6 @@ | |||
27 | 27 | ||
28 | #define SCLP_HEADER "sclp: " | 28 | #define SCLP_HEADER "sclp: " |
29 | 29 | ||
30 | /* Structure for register_early_external_interrupt. */ | ||
31 | static ext_int_info_t ext_int_info_hwc; | ||
32 | |||
33 | /* Lock to protect internal data consistency. */ | 30 | /* Lock to protect internal data consistency. */ |
34 | static DEFINE_SPINLOCK(sclp_lock); | 31 | static DEFINE_SPINLOCK(sclp_lock); |
35 | 32 | ||
@@ -870,8 +867,7 @@ sclp_check_interface(void) | |||
870 | 867 | ||
871 | spin_lock_irqsave(&sclp_lock, flags); | 868 | spin_lock_irqsave(&sclp_lock, flags); |
872 | /* Prepare init mask command */ | 869 | /* Prepare init mask command */ |
873 | rc = register_early_external_interrupt(0x2401, sclp_check_handler, | 870 | rc = register_external_interrupt(0x2401, sclp_check_handler); |
874 | &ext_int_info_hwc); | ||
875 | if (rc) { | 871 | if (rc) { |
876 | spin_unlock_irqrestore(&sclp_lock, flags); | 872 | spin_unlock_irqrestore(&sclp_lock, flags); |
877 | return rc; | 873 | return rc; |
@@ -904,8 +900,7 @@ sclp_check_interface(void) | |||
904 | } else | 900 | } else |
905 | rc = -EBUSY; | 901 | rc = -EBUSY; |
906 | } | 902 | } |
907 | unregister_early_external_interrupt(0x2401, sclp_check_handler, | 903 | unregister_external_interrupt(0x2401, sclp_check_handler); |
908 | &ext_int_info_hwc); | ||
909 | spin_unlock_irqrestore(&sclp_lock, flags); | 904 | spin_unlock_irqrestore(&sclp_lock, flags); |
910 | return rc; | 905 | return rc; |
911 | } | 906 | } |
@@ -1068,8 +1063,7 @@ sclp_init(void) | |||
1068 | if (rc) | 1063 | if (rc) |
1069 | goto fail_init_state_uninitialized; | 1064 | goto fail_init_state_uninitialized; |
1070 | /* Register interrupt handler */ | 1065 | /* Register interrupt handler */ |
1071 | rc = register_early_external_interrupt(0x2401, sclp_interrupt_handler, | 1066 | rc = register_external_interrupt(0x2401, sclp_interrupt_handler); |
1072 | &ext_int_info_hwc); | ||
1073 | if (rc) | 1067 | if (rc) |
1074 | goto fail_unregister_reboot_notifier; | 1068 | goto fail_unregister_reboot_notifier; |
1075 | sclp_init_state = sclp_init_state_initialized; | 1069 | sclp_init_state = sclp_init_state_initialized; |