aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2012-10-29 10:56:26 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-30 13:19:32 -0700
commit755b6040fa62eab9d9105359cd5884910eef2df4 (patch)
tree5c2e9dab8120c301516b663d1fae5101b19d71b4 /drivers/usb/serial/ftdi_sio.c
parent428d9988557f0f26047af304cf1f3d130b06ed4d (diff)
downloadlinux-linaro-stable-755b6040fa62eab9d9105359cd5884910eef2df4.tar.gz
USB: ftdi_sio: use generic chars_in_buffer
Use generic chars_in_buffer rather than copying it's implementation. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r--drivers/usb/serial/ftdi_sio.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 06b5d75dffc6..9fe3a2e965ad 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -2093,16 +2093,11 @@ static int ftdi_chars_in_buffer(struct tty_struct *tty)
{
struct usb_serial_port *port = tty->driver_data;
struct ftdi_private *priv = usb_get_serial_port_data(port);
- unsigned long flags;
int chars;
unsigned char *buf;
int ret;
- /* Check software buffer (code from
- * usb_serial_generic_chars_in_buffer()) */
- spin_lock_irqsave(&port->lock, flags);
- chars = kfifo_len(&port->write_fifo) + port->tx_bytes;
- spin_unlock_irqrestore(&port->lock, flags);
+ chars = usb_serial_generic_chars_in_buffer(tty);
/* Check hardware buffer */
switch (priv->chip_type) {