aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-03-05 08:52:07 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-08 14:47:01 -0500
commit885f8b0f8ab497b8520f95ff3c1bb7efb1c331ac (patch)
tree3fae6d1e520e30060be79f9413b528c847dcf7e6 /arch/xtensa
parentc9ddb1d6e29697029118377c1f4f9a4a148d755e (diff)
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 <jslaby@suse.cz> Cc: Chris Zankel <chris@zankel.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/xtensa')
-rw-r--r--arch/xtensa/platforms/iss/console.c4
1 files changed, 4 insertions, 0 deletions
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 @@
37#define SERIAL_TIMER_VALUE (20 * HZ) 37#define SERIAL_TIMER_VALUE (20 * HZ)
38 38
39static struct tty_driver *serial_driver; 39static struct tty_driver *serial_driver;
40static struct tty_port serial_port;
40static struct timer_list serial_timer; 41static struct timer_list serial_timer;
41 42
42static DEFINE_SPINLOCK(timer_lock); 43static DEFINE_SPINLOCK(timer_lock);
@@ -68,6 +69,7 @@ static void rs_poll(unsigned long);
68 69
69static int rs_open(struct tty_struct *tty, struct file * filp) 70static int rs_open(struct tty_struct *tty, struct file * filp)
70{ 71{
72 tty->port = &serial_port;
71 spin_lock(&timer_lock); 73 spin_lock(&timer_lock);
72 if (tty->count == 1) { 74 if (tty->count == 1) {
73 setup_timer(&serial_timer, rs_poll, (unsigned long)tty); 75 setup_timer(&serial_timer, rs_poll, (unsigned long)tty);
@@ -202,6 +204,8 @@ static const struct tty_operations serial_ops = {
202 204
203int __init rs_init(void) 205int __init rs_init(void)
204{ 206{
207 tty_port_init(&serial_port);
208
205 serial_driver = alloc_tty_driver(SERIAL_MAX_NUM_LINES); 209 serial_driver = alloc_tty_driver(SERIAL_MAX_NUM_LINES);
206 210
207 printk ("%s %s\n", serial_name, serial_version); 211 printk ("%s %s\n", serial_name, serial_version);