korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-28 14:44:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[S390] hvc_iucv: Refactor console and device initialization

Browse Source 
The console_initcall() order might pick up the hvc_iucv device as preferred
console even if it is not yet initialized.
Move HVC console instantiation to hvc_iucv_init() and cleanup device driver
initialization.

Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Hendrik Brueckner 2009-01-09 12:15:00 +01:00 committed by Martin Schwidefsky
parent 17e19f04ac
commit 68c6b3d2c6
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/char/hvc_iucv.c
View File

@ -14,6 +14,7 @@
#include <linux/types.h>
#include <asm/ebcdic.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/mempool.h>
#include <linux/module.h>
#include <linux/tty.h>
@ -898,6 +899,13 @@ static int __init hvc_iucv_init(void)
return -ENOMEM;
}
/* register the first terminal device as console
* (must be done before allocating hvc terminal devices) */
rc = hvc_instantiate(HVC_IUCV_MAGIC, 0, &hvc_iucv_ops);
if (rc)
pr_warning("Registering HVC terminal device as "
"Linux console failed\n");
/* allocate hvc_iucv_private structs */
for (i = 0; i < hvc_iucv_devices; i++) {
rc = hvc_iucv_alloc(i);
@ -932,16 +940,6 @@ out_error_hvc:
return rc;
}
/**
* hvc_iucv_console_init() - Early console initialization
*/
static int __init hvc_iucv_console_init(void)
{
if (!MACHINE_IS_VM || !hvc_iucv_devices)
return -ENODEV;
return hvc_instantiate(HVC_IUCV_MAGIC, 0, &hvc_iucv_ops);
}
/**
* hvc_iucv_config() - Parsing of hvc_iucv= kernel command line parameter
* @val: Parameter value (numeric)
@ -952,10 +950,5 @@ static int __init hvc_iucv_config(char *val)
}
module_init(hvc_iucv_init);
console_initcall(hvc_iucv_console_init);
device_initcall(hvc_iucv_init);
__setup("hvc_iucv=", hvc_iucv_config);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("HVC back-end for z/VM IUCV.");
MODULE_AUTHOR("Hendrik Brueckner <brueckner@linux.vnet.ibm.com>");