public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tty: Fold one-line assign function into callers

Browse source 
Now that tty_ldisc_assign() is a one-line file-scoped function,
remove it and perform the simple assignment at its call sites.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Hurley 2013-03-11 16:44:42 -04:00 • committed by Greg Kroah-Hartman
parent 16759f6cd8
commit f48070457c
1 changed files with 6 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/tty/tty_ldisc.c
View file

@ -227,24 +227,6 @@ const struct file_operations tty_ldiscs_proc_fops = {
.release = seq_release, .release = seq_release,
}; };
/**
* tty_ldisc_assign - set ldisc on a tty
* @tty: tty to assign
* @ld: line discipline
*
* Install an instance of a line discipline into a tty structure. The
* ldisc must have a reference count above zero to ensure it remains.
* The tty instance refcount starts at zero.
*
* Locking:
* Caller must hold references
*/
static void tty_ldisc_assign(struct tty_struct *tty, struct tty_ldisc *ld)
{
tty->ldisc = ld;
}
/** /**
* tty_ldisc_try - internal helper * tty_ldisc_try - internal helper
* @tty: the tty * @tty: the tty
@ -488,7 +470,7 @@ static void tty_ldisc_restore(struct tty_struct *tty, struct tty_ldisc *old)
/* There is an outstanding reference here so this is safe */ /* There is an outstanding reference here so this is safe */
old = tty_ldisc_get(old->ops->num); old = tty_ldisc_get(old->ops->num);
WARN_ON(IS_ERR(old)); WARN_ON(IS_ERR(old));
tty_ldisc_assign(tty, old); tty->ldisc = old;
tty_set_termios_ldisc(tty, old->ops->num); tty_set_termios_ldisc(tty, old->ops->num);
if (tty_ldisc_open(tty, old) < 0) { if (tty_ldisc_open(tty, old) < 0) {
tty_ldisc_put(old); tty_ldisc_put(old);
@ -496,7 +478,7 @@ static void tty_ldisc_restore(struct tty_struct *tty, struct tty_ldisc *old)
new_ldisc = tty_ldisc_get(N_TTY); new_ldisc = tty_ldisc_get(N_TTY);
if (IS_ERR(new_ldisc)) if (IS_ERR(new_ldisc))
panic("n_tty: get"); panic("n_tty: get");
tty_ldisc_assign(tty, new_ldisc); tty->ldisc = new_ldisc;
tty_set_termios_ldisc(tty, N_TTY); tty_set_termios_ldisc(tty, N_TTY);
r = tty_ldisc_open(tty, new_ldisc); r = tty_ldisc_open(tty, new_ldisc);
if (r < 0) if (r < 0)
@ -725,7 +707,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
tty_ldisc_close(tty, o_ldisc); tty_ldisc_close(tty, o_ldisc);
/* Now set up the new line discipline. */ /* Now set up the new line discipline. */
tty_ldisc_assign(tty, new_ldisc); tty->ldisc = new_ldisc;
tty_set_termios_ldisc(tty, ldisc); tty_set_termios_ldisc(tty, ldisc);
retval = tty_ldisc_open(tty, new_ldisc); retval = tty_ldisc_open(tty, new_ldisc);
@ -799,11 +781,10 @@ static int tty_ldisc_reinit(struct tty_struct *tty, int ldisc)
tty_ldisc_close(tty, tty->ldisc); tty_ldisc_close(tty, tty->ldisc);
tty_ldisc_put(tty->ldisc); tty_ldisc_put(tty->ldisc);
tty->ldisc = NULL;
/* /*
* Switch the line discipline back * Switch the line discipline back
*/ */
tty_ldisc_assign(tty, ld); tty->ldisc = ld;
tty_set_termios_ldisc(tty, ldisc); tty_set_termios_ldisc(tty, ldisc);
return 0; return 0;
@ -986,7 +967,7 @@ void tty_ldisc_init(struct tty_struct *tty)
struct tty_ldisc *ld = tty_ldisc_get(N_TTY); struct tty_ldisc *ld = tty_ldisc_get(N_TTY);
if (IS_ERR(ld)) if (IS_ERR(ld))
panic("n_tty: init_tty"); panic("n_tty: init_tty");
tty_ldisc_assign(tty, ld); tty->ldisc = ld;
} }
/** /**
@ -999,7 +980,7 @@ void tty_ldisc_init(struct tty_struct *tty)
void tty_ldisc_deinit(struct tty_struct *tty) void tty_ldisc_deinit(struct tty_struct *tty)
{ {
tty_ldisc_put(tty->ldisc); tty_ldisc_put(tty->ldisc);
tty_ldisc_assign(tty, NULL); tty->ldisc = NULL;
} }
void tty_ldisc_begin(void) void tty_ldisc_begin(void)