Commit 47aa658a authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

tty: Merge __tty_flush_buffer() into lone call site 



__tty_flush_buffer() is now only called by tty_flush_buffer();
merge functions.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0f56bd2f

drivers/tty/tty_buffer.c

+6 −23
Original line number Diff line number Diff line
@@ -150,28 +150,6 @@ static void tty_buffer_free(struct tty_port *port, struct tty_buffer *b) 
		llist_add(&b->free, &buf->free);

}



/**

 *	__tty_buffer_flush		-	flush full tty buffers

 *	@tty: tty to flush

 *

 *	flush all the buffers containing receive data. Caller must

 *	hold the buffer lock and must have ensured no parallel flush to

 *	ldisc is running.

 */



static void __tty_buffer_flush(struct tty_port *port)

{

	struct tty_bufhead *buf = &port->buf;

	struct tty_buffer *next;



	while ((next = buf->head->next) != NULL) {

		tty_buffer_free(port, buf->head);

		buf->head = next;

	}

	WARN_ON(buf->head != buf->tail);

	buf->head->read = buf->head->commit;

}



/**

 *	tty_buffer_flush		-	flush full tty buffers

 *	@tty: tty to flush
@@ -188,11 +166,16 @@ void tty_buffer_flush(struct tty_struct *tty) 
{

	struct tty_port *port = tty->port;

	struct tty_bufhead *buf = &port->buf;

	struct tty_buffer *next;



	buf->flushpending = 1;



	mutex_lock(&buf->flush_mutex);

	__tty_buffer_flush(port);

	while ((next = buf->head->next) != NULL) {

		tty_buffer_free(port, buf->head);

		buf->head = next;

	}

	buf->head->read = buf->head->commit;

	buf->flushpending = 0;

	mutex_unlock(&buf->flush_mutex);

}