diff options
author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2008-07-14 03:59:01 -0400 |
---|---|---|
committer | Heiko Carstens <heiko.carstens@de.ibm.com> | 2008-07-14 04:02:11 -0400 |
commit | 6ef556ccc8fd256259745c4f0d0ab65aaf703824 (patch) | |
tree | f4029c1723d9bcf7e3627b7515f314d836ccbac9 /drivers/s390/cio/cio.c | |
parent | fcc6ab335ba4d0f2b2548a910466c0dac767e5b1 (diff) |
[S390] cio: Use isc_{register,unregister}.
Use the new isc registration functions for all places that need
an I/O interruption subclass.
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'drivers/s390/cio/cio.c')
-rw-r--r-- | drivers/s390/cio/cio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c index bf616daeff4c..34b38fb7c2f7 100644 --- a/drivers/s390/cio/cio.c +++ b/drivers/s390/cio/cio.c | |||
@@ -786,12 +786,13 @@ cio_probe_console(void) | |||
786 | /* | 786 | /* |
787 | * enable console I/O-interrupt subclass | 787 | * enable console I/O-interrupt subclass |
788 | */ | 788 | */ |
789 | ctl_set_bit(6, 31 - CONSOLE_ISC); | 789 | isc_register(CONSOLE_ISC); |
790 | console_subchannel.schib.pmcw.isc = CONSOLE_ISC; | 790 | console_subchannel.schib.pmcw.isc = CONSOLE_ISC; |
791 | console_subchannel.schib.pmcw.intparm = | 791 | console_subchannel.schib.pmcw.intparm = |
792 | (u32)(addr_t)&console_subchannel; | 792 | (u32)(addr_t)&console_subchannel; |
793 | ret = cio_modify(&console_subchannel); | 793 | ret = cio_modify(&console_subchannel); |
794 | if (ret) { | 794 | if (ret) { |
795 | isc_unregister(CONSOLE_ISC); | ||
795 | console_subchannel_in_use = 0; | 796 | console_subchannel_in_use = 0; |
796 | return ERR_PTR(ret); | 797 | return ERR_PTR(ret); |
797 | } | 798 | } |
@@ -803,7 +804,7 @@ cio_release_console(void) | |||
803 | { | 804 | { |
804 | console_subchannel.schib.pmcw.intparm = 0; | 805 | console_subchannel.schib.pmcw.intparm = 0; |
805 | cio_modify(&console_subchannel); | 806 | cio_modify(&console_subchannel); |
806 | ctl_clear_bit(6, 31 - CONSOLE_ISC); | 807 | isc_unregister(CONSOLE_ISC); |
807 | console_subchannel_in_use = 0; | 808 | console_subchannel_in_use = 0; |
808 | } | 809 | } |
809 | 810 | ||