diff options
author | Jiri Slaby <jslaby@suse.cz> | 2013-01-03 09:53:01 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-16 01:17:28 -0500 |
commit | 227434f8986c3827a1faedd1feb437acd6285315 (patch) | |
tree | e96f6c6a800b81d096be73c1b7943c7aa24aa632 /arch/um | |
parent | ea28fd56fcde69af768135e428093f94c5ca6a88 (diff) |
TTY: switch tty_buffer_request_room to tty_port
Now, we start converting tty buffer functions to actually use
tty_port. This will allow us to get rid of the need of tty pointer in
many call sites. Only tty_port will be needed and hence no more
tty_port_tty_get calls in those paths.
Here we start with tty_buffer_request_room.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/drivers/chan_kern.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c index e9a0abc6a32f..4ff2503a1bb8 100644 --- a/arch/um/drivers/chan_kern.c +++ b/arch/um/drivers/chan_kern.c | |||
@@ -554,6 +554,7 @@ int parse_chan_pair(char *str, struct line *line, int device, | |||
554 | 554 | ||
555 | void chan_interrupt(struct line *line, struct tty_struct *tty, int irq) | 555 | void chan_interrupt(struct line *line, struct tty_struct *tty, int irq) |
556 | { | 556 | { |
557 | struct tty_port *port = &line->port; | ||
557 | struct chan *chan = line->chan_in; | 558 | struct chan *chan = line->chan_in; |
558 | int err; | 559 | int err; |
559 | char c; | 560 | char c; |
@@ -562,7 +563,7 @@ void chan_interrupt(struct line *line, struct tty_struct *tty, int irq) | |||
562 | goto out; | 563 | goto out; |
563 | 564 | ||
564 | do { | 565 | do { |
565 | if (tty && !tty_buffer_request_room(tty, 1)) { | 566 | if (!tty_buffer_request_room(port, 1)) { |
566 | schedule_delayed_work(&line->task, 1); | 567 | schedule_delayed_work(&line->task, 1); |
567 | goto out; | 568 | goto out; |
568 | } | 569 | } |