Commit 5669b705 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'tty-linus' into tty-next 



We want the tty core fixes in here as well, because other patches depend
on them.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 05202872 45a7bd63

Documentation/ABI/testing/sysfs-tty

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ Date: Nov 2010 
Contact:	Kay Sievers <kay.sievers@vrfy.org>

Description:

		 Shows the list of currently configured

		 console devices, like 'tty1 ttyS0'.

		 tty devices used for the console,

		 like 'tty1 ttyS0'.

		 The last entry in the file is the active

		 device connected to /dev/console.

		 The file supports poll() to detect virtual

drivers/tty/hvc/hvc_opal.c

+1 −7
Original line number Diff line number Diff line
@@ -255,13 +255,7 @@ static int __init hvc_opal_init(void) 
	/* Register as a vio device to receive callbacks */

	return platform_driver_register(&hvc_opal_driver);

}

module_init(hvc_opal_init);



static void __exit hvc_opal_exit(void)

{

	platform_driver_unregister(&hvc_opal_driver);

}

module_exit(hvc_opal_exit);

device_initcall(hvc_opal_init);



static void udbg_opal_putc(char c)

{

drivers/tty/hvc/hvc_rtas.c

+1 −11
Original line number Diff line number Diff line
@@ -102,17 +102,7 @@ static int __init hvc_rtas_init(void) 


	return 0;

}

module_init(hvc_rtas_init);



/* This will tear down the tty portion of the driver */

static void __exit hvc_rtas_exit(void)

{

	/* Really the fun isn't over until the worker thread breaks down and

	 * the tty cleans up */

	if (hvc_rtas_dev)

		hvc_remove(hvc_rtas_dev);

}

module_exit(hvc_rtas_exit);

device_initcall(hvc_rtas_init);



/* This will happen prior to module init.  There is no tty at this time? */

static int __init hvc_rtas_console_init(void)

drivers/tty/hvc/hvc_udbg.c

+1 −8
Original line number Diff line number Diff line
@@ -80,14 +80,7 @@ static int __init hvc_udbg_init(void) 


	return 0;

}

module_init(hvc_udbg_init);



static void __exit hvc_udbg_exit(void)

{

	if (hvc_udbg_dev)

		hvc_remove(hvc_udbg_dev);

}

module_exit(hvc_udbg_exit);

device_initcall(hvc_udbg_init);



static int __init hvc_udbg_console_init(void)

{

drivers/tty/hvc/hvc_xen.c

+1 −16
Original line number Diff line number Diff line
@@ -561,18 +561,7 @@ static int __init xen_hvc_init(void) 
#endif

	return r;

}



static void __exit xen_hvc_fini(void)

{

	struct xencons_info *entry, *next;



	if (list_empty(&xenconsoles))

			return;



	list_for_each_entry_safe(entry, next, &xenconsoles, list) {

		xen_console_remove(entry);

	}

}

device_initcall(xen_hvc_init);



static int xen_cons_init(void)

{
@@ -598,10 +587,6 @@ static int xen_cons_init(void) 
	hvc_instantiate(HVC_COOKIE, 0, ops);

	return 0;

}





module_init(xen_hvc_init);

module_exit(xen_hvc_fini);

console_initcall(xen_cons_init);



#ifdef CONFIG_EARLY_PRINTK