summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2010-02-17 13:07:13 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-02 14:43:22 -0800
commit4165fe4ef7305609a96c7f248cefb9c414d0ede5 (patch)
tree3e239b821a4b5365c7e15996d44fbf4726cd7840 /drivers/serial
parent638b9648ab51c9c549ff5735d3de519ef6199df3 (diff)
downloadop-kernel-dev-4165fe4ef7305609a96c7f248cefb9c414d0ede5.zip
op-kernel-dev-4165fe4ef7305609a96c7f248cefb9c414d0ede5.tar.gz
tty: Fix up char drivers request_room usage
We can't change them all but quite a few misuse it. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/icom.c1
-rw-r--r--drivers/serial/ioc3_serial.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index 6e715b7..53a4682 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -751,7 +751,6 @@ static void recv_interrupt(u16 port_int_reg, struct icom_port *icom_port)
trace(icom_port, "FID_STATUS", status);
count = cpu_to_le16(icom_port->statStg->rcv[rcv_buff].leLength);
- count = tty_buffer_request_room(tty, count);
trace(icom_port, "RCV_COUNT", count);
trace(icom_port, "REAL_COUNT", count);
diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c
index 85dc041..23ba6b4 100644
--- a/drivers/serial/ioc3_serial.c
+++ b/drivers/serial/ioc3_serial.c
@@ -1411,8 +1411,7 @@ static int receive_chars(struct uart_port *the_port)
read_count = do_read(the_port, ch, MAX_CHARS);
if (read_count > 0) {
flip = 1;
- read_room = tty_buffer_request_room(tty, read_count);
- tty_insert_flip_string(tty, ch, read_room);
+ read_room = tty_insert_flip_string(tty, ch, read_count);
the_port->icount.rx += read_count;
}
spin_unlock_irqrestore(&the_port->lock, pflags);
OpenPOWER on IntegriCloud