From: Jiri Slaby Date: Mon, 5 Mar 2012 13:52:07 +0000 (+0100) Subject: TTY: iss/console, use tty_port X-Git-Tag: firefly_0821_release~3680^2~3346^2~72 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=885f8b0f8ab497b8520f95ff3c1bb7efb1c331ac;p=firefly-linux-kernel-4.4.55.git TTY: iss/console, use tty_port Even though the port is not used for anything real there yet, this will change as tty buffers will be in tty_port in the near future. So the port will be needed in all drivers. Signed-off-by: Jiri Slaby Cc: Chris Zankel Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c index 94ab8eca9d77..d1a7861b81f7 100644 --- a/arch/xtensa/platforms/iss/console.c +++ b/arch/xtensa/platforms/iss/console.c @@ -37,6 +37,7 @@ #define SERIAL_TIMER_VALUE (20 * HZ) static struct tty_driver *serial_driver; +static struct tty_port serial_port; static struct timer_list serial_timer; static DEFINE_SPINLOCK(timer_lock); @@ -68,6 +69,7 @@ static void rs_poll(unsigned long); static int rs_open(struct tty_struct *tty, struct file * filp) { + tty->port = &serial_port; spin_lock(&timer_lock); if (tty->count == 1) { setup_timer(&serial_timer, rs_poll, (unsigned long)tty); @@ -202,6 +204,8 @@ static const struct tty_operations serial_ops = { int __init rs_init(void) { + tty_port_init(&serial_port); + serial_driver = alloc_tty_driver(SERIAL_MAX_NUM_LINES); printk ("%s %s\n", serial_name, serial_version);