Commit 4434a38c authored by Cornelia Huck's avatar Cornelia Huck Committed by Martin Schwidefsky

[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: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 303fa9e3
...@@ -990,8 +990,7 @@ int chsc_get_channel_measurement_chars(struct channel_path *chp) ...@@ -990,8 +990,7 @@ int chsc_get_channel_measurement_chars(struct channel_path *chp)
return ret; return ret;
} }
static int __init int __init chsc_alloc_sei_area(void)
chsc_alloc_sei_area(void)
{ {
sei_page = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA); sei_page = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
if (!sei_page) if (!sei_page)
...@@ -1000,6 +999,11 @@ chsc_alloc_sei_area(void) ...@@ -1000,6 +999,11 @@ chsc_alloc_sei_area(void)
return (sei_page ? 0 : -ENOMEM); return (sei_page ? 0 : -ENOMEM);
} }
void __init chsc_free_sei_area(void)
{
kfree(sei_page);
}
int __init int __init
chsc_enable_facility(int operation_code) chsc_enable_facility(int operation_code)
{ {
...@@ -1051,8 +1055,6 @@ chsc_enable_facility(int operation_code) ...@@ -1051,8 +1055,6 @@ chsc_enable_facility(int operation_code)
return ret; return ret;
} }
subsys_initcall(chsc_alloc_sei_area);
struct css_general_char css_general_characteristics; struct css_general_char css_general_characteristics;
struct css_chsc_char css_chsc_characteristics; struct css_chsc_char css_chsc_characteristics;
......
...@@ -79,6 +79,8 @@ extern int chsc_get_ssd_info(struct subchannel_id schid, ...@@ -79,6 +79,8 @@ extern int chsc_get_ssd_info(struct subchannel_id schid,
struct chsc_ssd_info *ssd); struct chsc_ssd_info *ssd);
extern int chsc_determine_css_characteristics(void); extern int chsc_determine_css_characteristics(void);
extern int css_characteristics_avail; extern int css_characteristics_avail;
extern int chsc_alloc_sei_area(void);
extern void chsc_free_sei_area(void);
extern int chsc_enable_facility(int); extern int chsc_enable_facility(int);
struct channel_subsystem; struct channel_subsystem;
......
...@@ -377,8 +377,6 @@ static int __init slow_subchannel_init(void) ...@@ -377,8 +377,6 @@ static int __init slow_subchannel_init(void)
return 0; return 0;
} }
subsys_initcall(slow_subchannel_init);
static void css_slow_path_func(struct work_struct *unused) static void css_slow_path_func(struct work_struct *unused)
{ {
struct subchannel_id schid; struct subchannel_id schid;
...@@ -641,9 +639,20 @@ init_channel_subsystem (void) ...@@ -641,9 +639,20 @@ init_channel_subsystem (void)
{ {
int ret, i; int ret, i;
if (chsc_determine_css_characteristics() == 0) ret = chsc_determine_css_characteristics();
if (ret == -ENOMEM)
goto out; /* No need to continue. */
if (ret == 0)
css_characteristics_avail = 1; css_characteristics_avail = 1;
ret = chsc_alloc_sei_area();
if (ret)
goto out;
ret = slow_subchannel_init();
if (ret)
goto out;
if ((ret = bus_register(&css_bus_type))) if ((ret = bus_register(&css_bus_type)))
goto out; goto out;
...@@ -709,6 +718,10 @@ init_channel_subsystem (void) ...@@ -709,6 +718,10 @@ init_channel_subsystem (void)
out_bus: out_bus:
bus_unregister(&css_bus_type); bus_unregister(&css_bus_type);
out: out:
chsc_free_sei_area();
kfree(slow_subchannel_set);
printk(KERN_WARNING"cio: failed to initialize css driver (%d)!\n",
ret);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment