diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2013-01-03 15:53:06 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-15 22:30:15 -0800 |
| commit | 2e124b4a390ca85325fae75764bef92f0547fa25 (patch) | |
| tree | 5519fbcdbe954e79b271ea6d31ac5a4dc754c4f5 /drivers/staging/serqt_usb2 | |
| parent | d6c53c0e9bd0a83f9f9ddbc9fd80141a54d83896 (diff) | |
| download | linux-3.10-2e124b4a390ca85325fae75764bef92f0547fa25.tar.gz linux-3.10-2e124b4a390ca85325fae75764bef92f0547fa25.tar.bz2 linux-3.10-2e124b4a390ca85325fae75764bef92f0547fa25.zip | |
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 'drivers/staging/serqt_usb2')
| -rw-r--r-- | drivers/staging/serqt_usb2/serqt_usb2.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c index 14965662d09..df29a3de29f 100644 --- a/drivers/staging/serqt_usb2/serqt_usb2.c +++ b/drivers/staging/serqt_usb2/serqt_usb2.c @@ -290,8 +290,7 @@ static void qt_interrupt_callback(struct urb *urb) /* FIXME */ } -static void qt_status_change_check(struct tty_struct *tty, - struct urb *urb, +static void qt_status_change_check(struct urb *urb, struct quatech_port *qt_port, struct usb_serial_port *port) { @@ -348,7 +347,7 @@ static void qt_status_change_check(struct tty_struct *tty, tty_insert_flip_char(&port->port, data[i], TTY_NORMAL); } - tty_flip_buffer_push(tty); + tty_flip_buffer_push(&port->port); } static void qt_read_bulk_callback(struct urb *urb) @@ -411,7 +410,7 @@ static void qt_read_bulk_callback(struct urb *urb) } if (urb->actual_length) - qt_status_change_check(tty, urb, qt_port, port); + qt_status_change_check(urb, qt_port, port); /* Continue trying to always read */ usb_fill_bulk_urb(port->read_urb, serial->dev, @@ -427,7 +426,7 @@ static void qt_read_bulk_callback(struct urb *urb) __func__, result); else { if (urb->actual_length) { - tty_flip_buffer_push(tty); + tty_flip_buffer_push(&port->port); tty_schedule_flip(tty); } } |