Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e39085b8 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty: drop tty_schedule_flip() 



commit 5db96ef23bda6c2a61a51693c85b78b52d03f654 upstream.

Since commit a9c3f68f (tty: Fix low_latency BUG) in 2014,
tty_flip_buffer_push() is only a wrapper to tty_schedule_flip(). All
users were converted in the previous patches, so remove
tty_schedule_flip() completely while inlining its body into
tty_flip_buffer_push().

One less exported function.

Reviewed-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20211122111648.30379-4-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0a67b4a8

drivers/tty/tty_buffer.c

+8 −22
Original line number Diff line number Diff line
@@ -388,27 +388,6 @@ int __tty_insert_flip_char(struct tty_port *port, unsigned char ch, char flag) 
}

EXPORT_SYMBOL(__tty_insert_flip_char);



/**

 *	tty_schedule_flip	-	push characters to ldisc

 *	@port: tty port to push from

 *

 *	Takes any pending buffers and transfers their ownership to the

 *	ldisc side of the queue. It then schedules those characters for

 *	processing by the line discipline.

 */



void tty_schedule_flip(struct tty_port *port)

{

	struct tty_bufhead *buf = &port->buf;



	/* paired w/ acquire in flush_to_ldisc(); ensures

	 * flush_to_ldisc() sees buffer data.

	 */

	smp_store_release(&buf->tail->commit, buf->tail->used);

	queue_work(system_unbound_wq, &buf->work);

}

EXPORT_SYMBOL(tty_schedule_flip);



/**

 *	tty_prepare_flip_string		-	make room for characters

 *	@port: tty port
@@ -560,7 +539,14 @@ static void flush_to_ldisc(struct work_struct *work) 


void tty_flip_buffer_push(struct tty_port *port)

{

	tty_schedule_flip(port);

	struct tty_bufhead *buf = &port->buf;



	/*

	 * Paired w/ acquire in flush_to_ldisc(); ensures flush_to_ldisc() sees

	 * buffer data.

	 */

	smp_store_release(&buf->tail->commit, buf->tail->used);

	queue_work(system_unbound_wq, &buf->work);

}

EXPORT_SYMBOL(tty_flip_buffer_push);

include/linux/tty_flip.h

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ extern int tty_insert_flip_string_fixed_flag(struct tty_port *port, 
extern int tty_prepare_flip_string(struct tty_port *port,

		unsigned char **chars, size_t size);

extern void tty_flip_buffer_push(struct tty_port *port);

void tty_schedule_flip(struct tty_port *port);

int __tty_insert_flip_char(struct tty_port *port, unsigned char ch, char flag);



static inline int tty_insert_flip_char(struct tty_port *port,