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

Commit f2c4c65c authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

tty: Move ldisc_flush 



We have a tty_ldisc file now so put tty_ldisc_flush in the right place

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c65c9bc3

drivers/char/tty_io.c

+0 −21
Original line number Diff line number Diff line
@@ -470,27 +470,6 @@ void tty_wakeup(struct tty_struct *tty) 


EXPORT_SYMBOL_GPL(tty_wakeup);



/**

 *	tty_ldisc_flush	-	flush line discipline queue

 *	@tty: tty

 *

 *	Flush the line discipline queue (if any) for this tty. If there

 *	is no line discipline active this is a no-op.

 */



void tty_ldisc_flush(struct tty_struct *tty)

{

	struct tty_ldisc *ld = tty_ldisc_ref(tty);

	if (ld) {

		if (ld->ops->flush_buffer)

			ld->ops->flush_buffer(tty);

		tty_ldisc_deref(ld);

	}

	tty_buffer_flush(tty);

}



EXPORT_SYMBOL_GPL(tty_ldisc_flush);



/**

 *	do_tty_hangup		-	actual handler for hangup events

 *	@work: tty device

drivers/char/tty_ldisc.c

+21 −0
Original line number Diff line number Diff line
@@ -395,6 +395,27 @@ void tty_ldisc_enable(struct tty_struct *tty) 
	wake_up(&tty_ldisc_wait);

}



/**

 *	tty_ldisc_flush	-	flush line discipline queue

 *	@tty: tty

 *

 *	Flush the line discipline queue (if any) for this tty. If there

 *	is no line discipline active this is a no-op.

 */



void tty_ldisc_flush(struct tty_struct *tty)

{

	struct tty_ldisc *ld = tty_ldisc_ref(tty);

	if (ld) {

		if (ld->ops->flush_buffer)

			ld->ops->flush_buffer(tty);

		tty_ldisc_deref(ld);

	}

	tty_buffer_flush(tty);

}



EXPORT_SYMBOL_GPL(tty_ldisc_flush);



/**

 *	tty_set_termios_ldisc		-	set ldisc field

 *	@tty: tty structure