Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dd5bc40 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

TTY: pdc_cons, use tty_port 



Instead of digging a tty out of the tty_driver struct, which is not
defined to work, use tty_port properly. This includes proper tty
refcounting even though there is no possible race currently. But we
will need tty_port for tty buffers in the future anyway.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Helge Deller <deller@gmx.de>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0b479d54

arch/parisc/kernel/pdc_cons.c

+12 −7
Original line number Diff line number Diff line
@@ -92,10 +92,11 @@ static int pdc_console_setup(struct console *co, char *options) 


static void pdc_console_poll(unsigned long unused);

static DEFINE_TIMER(pdc_console_timer, pdc_console_poll, 0, 0);

static struct tty_port tty_port;



static int pdc_console_tty_open(struct tty_struct *tty, struct file *filp)

{



	tty_port_tty_set(&tty_port, tty);

	mod_timer(&pdc_console_timer, jiffies + PDC_CONS_POLL_DELAY);



	return 0;
@@ -103,8 +104,10 @@ static int pdc_console_tty_open(struct tty_struct *tty, struct file *filp) 


static void pdc_console_tty_close(struct tty_struct *tty, struct file *filp)

{

	if (!tty->count)

	if (!tty->count) {

		del_timer_sync(&pdc_console_timer);

		tty_port_tty_set(&tty_port, NULL);

	}

}



static int pdc_console_tty_write(struct tty_struct *tty, const unsigned char *buf, int count)
@@ -123,8 +126,6 @@ static int pdc_console_tty_chars_in_buffer(struct tty_struct *tty) 
	return 0; /* no buffer */

}



static struct tty_driver *pdc_console_tty_driver;



static const struct tty_operations pdc_console_tty_ops = {

	.open = pdc_console_tty_open,

	.close = pdc_console_tty_close,
@@ -135,10 +136,8 @@ static const struct tty_operations pdc_console_tty_ops = { 


static void pdc_console_poll(unsigned long unused)

{



	int data, count = 0;



	struct tty_struct *tty = pdc_console_tty_driver->ttys[0];

	struct tty_struct *tty = tty_port_tty_get(&tty_port);



	if (!tty)

		return;
@@ -154,10 +153,14 @@ static void pdc_console_poll(unsigned long unused) 
	if (count)

		tty_flip_buffer_push(tty);



	tty_kref_put(tty);



	if (pdc_cons.flags & CON_ENABLED)

		mod_timer(&pdc_console_timer, jiffies + PDC_CONS_POLL_DELAY);

}



static struct tty_driver *pdc_console_tty_driver;



static int __init pdc_console_tty_driver_init(void)

{

	int err;
@@ -182,6 +185,8 @@ static int __init pdc_console_tty_driver_init(void) 
	printk(KERN_INFO "The PDC console driver is still registered, removing CON_BOOT flag\n");

	pdc_cons.flags &= ~CON_BOOT;



	tty_port_init(&tty_port);



	pdc_console_tty_driver = alloc_tty_driver(1);



	if (!pdc_console_tty_driver)