diff options
author | Jiri Slaby <jslaby@suse.cz> | 2013-01-03 09:53:04 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-16 01:22:35 -0500 |
commit | 05c7cd39907184328f48d3e7899f9cdd653ad336 (patch) | |
tree | 9d1ed5c757426aa20b7eccd853faa6b519a4aa7b /drivers/usb/serial/keyspan.c | |
parent | 92a19f9cec9a80ad93c06e115822deb729e2c6ad (diff) |
TTY: switch tty_insert_flip_string
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.
tty_insert_flip_string this time.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/keyspan.c')
-rw-r--r-- | drivers/usb/serial/keyspan.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c index a4f5caebda43..14a219ba4ee6 100644 --- a/drivers/usb/serial/keyspan.c +++ b/drivers/usb/serial/keyspan.c | |||
@@ -472,7 +472,8 @@ static void usa28_indat_callback(struct urb *urb) | |||
472 | 472 | ||
473 | tty = tty_port_tty_get(&port->port); | 473 | tty = tty_port_tty_get(&port->port); |
474 | if (tty && urb->actual_length) { | 474 | if (tty && urb->actual_length) { |
475 | tty_insert_flip_string(tty, data, urb->actual_length); | 475 | tty_insert_flip_string(&port->port, data, |
476 | urb->actual_length); | ||
476 | tty_flip_buffer_push(tty); | 477 | tty_flip_buffer_push(tty); |
477 | } | 478 | } |
478 | tty_kref_put(tty); | 479 | tty_kref_put(tty); |
@@ -688,7 +689,7 @@ static void usa49_indat_callback(struct urb *urb) | |||
688 | /* 0x80 bit is error flag */ | 689 | /* 0x80 bit is error flag */ |
689 | if ((data[0] & 0x80) == 0) { | 690 | if ((data[0] & 0x80) == 0) { |
690 | /* no error on any byte */ | 691 | /* no error on any byte */ |
691 | tty_insert_flip_string(tty, data + 1, | 692 | tty_insert_flip_string(&port->port, data + 1, |
692 | urb->actual_length - 1); | 693 | urb->actual_length - 1); |
693 | } else { | 694 | } else { |
694 | /* some bytes had errors, every byte has status */ | 695 | /* some bytes had errors, every byte has status */ |
@@ -816,7 +817,8 @@ static void usa90_indat_callback(struct urb *urb) | |||
816 | otherwise looks like usa26 data format */ | 817 | otherwise looks like usa26 data format */ |
817 | 818 | ||
818 | if (p_priv->baud > 57600) | 819 | if (p_priv->baud > 57600) |
819 | tty_insert_flip_string(tty, data, urb->actual_length); | 820 | tty_insert_flip_string(&port->port, data, |
821 | urb->actual_length); | ||
820 | else { | 822 | else { |
821 | /* 0x80 bit is error flag */ | 823 | /* 0x80 bit is error flag */ |
822 | if ((data[0] & 0x80) == 0) { | 824 | if ((data[0] & 0x80) == 0) { |