[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Sun, 5 May 2013 20:32:33 +0200
From: Johan Hovold <jhovold@...il.com>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: Peter Hurley <peter@...leysoftware.com>,
Stas Sergeev <stsp@...t.ru>,
Jarkko Huijts <jarkko.huijts@...il.com>,
Alan Cox <alan@...ux.intel.com>, linux-usb@...r.kernel.org,
linux-serial@...r.kernel.org, linux-kernel@...r.kernel.org,
Caylan Van Larson <i@...lan.net>,
"Rafael J. Wysocki" <rjw@...k.pl>, Johan Hovold <jhovold@...il.com>
Subject: [PATCH 7/7] USB: serial: clean up chars_in_buffer
No need to grab disconnect mutex in chars_in_buffer now that no
sub-driver is or should be querying hardware buffers anymore. (They
should use wait_until_sent.)
Signed-off-by: Johan Hovold <jhovold@...il.com>
---
drivers/usb/serial/usb-serial.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 60caf9c..4753c00 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -359,20 +359,13 @@ static int serial_chars_in_buffer(struct tty_struct *tty)
{
struct usb_serial_port *port = tty->driver_data;
struct usb_serial *serial = port->serial;
- int count = 0;
dev_dbg(tty->dev, "%s\n", __func__);
- mutex_lock(&serial->disc_mutex);
- /* if the device was unplugged then any remaining characters
- fell out of the connector ;) */
if (serial->disconnected)
- count = 0;
- else
- count = serial->type->chars_in_buffer(tty);
- mutex_unlock(&serial->disc_mutex);
+ return 0;
- return count;
+ return serial->type->chars_in_buffer(tty);
}
static void serial_wait_until_sent(struct tty_struct *tty, int timeout)
--
1.8.2.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists