Commit 4165fe4e authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

tty: Fix up char drivers request_room usage 



We can't change them all but quite a few misuse it.

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 638b9648

drivers/char/nozomi.c

+0 −2
Original line number Diff line number Diff line
@@ -853,8 +853,6 @@ static int receive_data(enum port_type index, struct nozomi *dc) 
		goto put;

	}



	tty_buffer_request_room(tty, size);



	while (size > 0) {

		read_mem32((u32 *) buf, addr + offset, RECEIVE_BUF_MAX);

drivers/char/serial167.c

+1 −2
Original line number Diff line number Diff line
@@ -658,8 +658,7 @@ static irqreturn_t cd2401_rx_interrupt(int irq, void *dev_id) 
			info->mon.char_max = char_count;

		info->mon.char_last = char_count;

#endif

		len = tty_buffer_request_room(tty, char_count);

		while (len--) {

		while (char_count--) {

			data = base_addr[CyRDR];

			tty_insert_flip_char(tty, data, TTY_NORMAL);

#ifdef CYCLOM_16Y_HACK

drivers/char/specialix.c

+0 −2
Original line number Diff line number Diff line
@@ -646,8 +646,6 @@ static void sx_receive(struct specialix_board *bp) 
	dprintk(SX_DEBUG_RX, "port: %p: count: %d\n", port, count);

	port->hits[count > 8 ? 9 : count]++;



	tty_buffer_request_room(tty, count);



	while (count--)

		tty_insert_flip_char(tty, sx_in(bp, CD186x_RDR), TTY_NORMAL);

	tty_flip_buffer_push(tty);

drivers/serial/icom.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/serial/ioc3_serial.c

+1 −2
Original line number Diff line number Diff line
@@ -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);