diff options
author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2007-07-27 06:29:21 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2007-07-27 06:29:20 -0400 |
commit | 4434a38c37dd30e5cd01456a136367a43d8da2dd (patch) | |
tree | 7597941ae953297e8f8531e995d9b0c2e9a114a3 /drivers/s390/cio/chsc.c | |
parent | 303fa9e39605c1d56971dd22cd04d2186dc42c98 (diff) |
[S390] cio: Reorganize initialization.
- Localize more of the init calls in init_channel_subsystem().
- Print a warning if init_channel_subsystem() failed.
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/cio/chsc.c')
-rw-r--r-- | drivers/s390/cio/chsc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c index b38dc2478541..597c0c76a2ad 100644 --- a/drivers/s390/cio/chsc.c +++ b/drivers/s390/cio/chsc.c | |||
@@ -990,8 +990,7 @@ out: | |||
990 | return ret; | 990 | return ret; |
991 | } | 991 | } |
992 | 992 | ||
993 | static int __init | 993 | int __init chsc_alloc_sei_area(void) |
994 | chsc_alloc_sei_area(void) | ||
995 | { | 994 | { |
996 | sei_page = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA); | 995 | sei_page = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA); |
997 | if (!sei_page) | 996 | if (!sei_page) |
@@ -1000,6 +999,11 @@ chsc_alloc_sei_area(void) | |||
1000 | return (sei_page ? 0 : -ENOMEM); | 999 | return (sei_page ? 0 : -ENOMEM); |
1001 | } | 1000 | } |
1002 | 1001 | ||
1002 | void __init chsc_free_sei_area(void) | ||
1003 | { | ||
1004 | kfree(sei_page); | ||
1005 | } | ||
1006 | |||
1003 | int __init | 1007 | int __init |
1004 | chsc_enable_facility(int operation_code) | 1008 | chsc_enable_facility(int operation_code) |
1005 | { | 1009 | { |
@@ -1051,8 +1055,6 @@ chsc_enable_facility(int operation_code) | |||
1051 | return ret; | 1055 | return ret; |
1052 | } | 1056 | } |
1053 | 1057 | ||
1054 | subsys_initcall(chsc_alloc_sei_area); | ||
1055 | |||
1056 | struct css_general_char css_general_characteristics; | 1058 | struct css_general_char css_general_characteristics; |
1057 | struct css_chsc_char css_chsc_characteristics; | 1059 | struct css_chsc_char css_chsc_characteristics; |
1058 | 1060 | ||