aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/hp/sim/simserial.c
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2013-01-03 09:53:06 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-16 01:30:15 -0500
commit2e124b4a390ca85325fae75764bef92f0547fa25 (patch)
tree5519fbcdbe954e79b271ea6d31ac5a4dc754c4f5 /arch/ia64/hp/sim/simserial.c
parentd6c53c0e9bd0a83f9f9ddbc9fd80141a54d83896 (diff)
TTY: switch tty_flip_buffer_push
Now, we start converting tty buffer functions to actually use tty_port. This will allow us to get rid of the need of tty in many call sites. Only tty_port will needed and hence no more tty_port_tty_get in those paths. Now, the one where most of tty_port_tty_get gets removed: tty_flip_buffer_push. IOW we also closed all the races in drivers not using tty_port_tty_get at all yet. Also we move tty_flip_buffer_push declaration from include/linux/tty.h to include/linux/tty_flip.h to all others while we are changing it anyway. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/ia64/hp/sim/simserial.c')
-rw-r--r--arch/ia64/hp/sim/simserial.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index 942022a5bc86..da2f319fb71d 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -53,9 +53,8 @@ struct tty_driver *hp_simserial_driver;
53 53
54static struct console *console; 54static struct console *console;
55 55
56static void receive_chars(struct tty_struct *tty) 56static void receive_chars(struct tty_port *port)
57{ 57{
58 struct tty_port *port = tty->port;
59 unsigned char ch; 58 unsigned char ch;
60 static unsigned char seen_esc = 0; 59 static unsigned char seen_esc = 0;
61 60
@@ -85,7 +84,7 @@ static void receive_chars(struct tty_struct *tty)
85 if (tty_insert_flip_char(port, ch, TTY_NORMAL) == 0) 84 if (tty_insert_flip_char(port, ch, TTY_NORMAL) == 0)
86 break; 85 break;
87 } 86 }
88 tty_flip_buffer_push(tty); 87 tty_flip_buffer_push(port);
89} 88}
90 89
91/* 90/*
@@ -94,18 +93,9 @@ static void receive_chars(struct tty_struct *tty)
94static irqreturn_t rs_interrupt_single(int irq, void *dev_id) 93static irqreturn_t rs_interrupt_single(int irq, void *dev_id)
95{ 94{
96 struct serial_state *info = dev_id; 95 struct serial_state *info = dev_id;
97 struct tty_struct *tty = tty_port_tty_get(&info->port);
98 96
99 if (!tty) { 97 receive_chars(&info->port);
100 printk(KERN_INFO "%s: tty=0 problem\n", __func__); 98
101 return IRQ_NONE;
102 }
103 /*
104 * pretty simple in our case, because we only get interrupts
105 * on inbound traffic
106 */
107 receive_chars(tty);
108 tty_kref_put(tty);
109 return IRQ_HANDLED; 99 return IRQ_HANDLED;
110} 100}
111 101