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

Commit 6ffeb4b2 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

tty: Move tty_ldisc_kill() 



In preparation for destroying the line discipline instance on hangup,
move tty_ldisc_kill() to eliminate needless forward declarations.
No functional change.

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

drivers/tty/tty_ldisc.c

+19 −13
Original line number Diff line number Diff line
@@ -600,6 +600,25 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc) 
	return retval;

}



/**

 *	tty_ldisc_kill	-	teardown ldisc

 *	@tty: tty being released

 *

 *	Perform final close of the ldisc and reset tty->ldisc

 */

static void tty_ldisc_kill(struct tty_struct *tty)

{

	if (!tty->ldisc)

		return;

	/*

	 * Now kill off the ldisc

	 */

	tty_ldisc_close(tty, tty->ldisc);

	tty_ldisc_put(tty->ldisc);

	/* Force an oops if we mess this up */

	tty->ldisc = NULL;

}



/**

 *	tty_reset_termios	-	reset terminal state

 *	@tty: tty to reset
@@ -747,19 +766,6 @@ int tty_ldisc_setup(struct tty_struct *tty, struct tty_struct *o_tty) 
	return 0;

}



static void tty_ldisc_kill(struct tty_struct *tty)

{

	if (!tty->ldisc)

		return;

	/*

	 * Now kill off the ldisc

	 */

	tty_ldisc_close(tty, tty->ldisc);

	tty_ldisc_put(tty->ldisc);

	/* Force an oops if we mess this up */

	tty->ldisc = NULL;

}



/**

 *	tty_ldisc_release		-	release line discipline

 *	@tty: tty being shut down (or one end of pty pair)