OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tty: Use 'disc' for line discipline index name 

tty->ldisc is a ptr to struct tty_ldisc, but unfortunately 'ldisc' is
also used as a parameter or local name to refer to the line discipline
index value (ie, N_TTY, N_GSM, etc.); instead prefer the name used
by the line discipline registration/ref counting functions.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Hurley 2016-01-10 22:41:04 -08:00 committed by Greg Kroah-Hartman
parent 6ffeb4b278
commit c12da96f80
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/tty/tty_io.c
View File

@ -2662,13 +2662,13 @@ static int tiocgsid(struct tty_struct *tty, struct tty_struct *real_tty, pid_t _
static int tiocsetd(struct tty_struct *tty, int __user *p) static int tiocsetd(struct tty_struct *tty, int __user *p)
{ {
int ldisc; int disc;
int ret; int ret;
if (get_user(ldisc, p)) if (get_user(disc, p))
return -EFAULT; return -EFAULT;
ret = tty_set_ldisc(tty, ldisc); ret = tty_set_ldisc(tty, disc);
return ret; return ret;
} }

22
drivers/tty/tty_ldisc.c
View File

@ -417,7 +417,7 @@ EXPORT_SYMBOL_GPL(tty_ldisc_flush);
/** /**
* tty_set_termios_ldisc - set ldisc field * tty_set_termios_ldisc - set ldisc field
* @tty: tty structure * @tty: tty structure
* @num: line discipline number * @disc: line discipline number
* *
* This is probably overkill for real world processors but * This is probably overkill for real world processors but
* they are not on hot paths so a little discipline won't do * they are not on hot paths so a little discipline won't do
@ -430,10 +430,10 @@ EXPORT_SYMBOL_GPL(tty_ldisc_flush);
* Locking: takes termios_rwsem * Locking: takes termios_rwsem
*/ */
static void tty_set_termios_ldisc(struct tty_struct *tty, int num) static void tty_set_termios_ldisc(struct tty_struct *tty, int disc)
{ {
down_write(&tty->termios_rwsem); down_write(&tty->termios_rwsem);
tty->termios.c_line = num; tty->termios.c_line = disc;
up_write(&tty->termios_rwsem); up_write(&tty->termios_rwsem);
tty->disc_data = NULL; tty->disc_data = NULL;
@ -531,12 +531,12 @@ static void tty_ldisc_restore(struct tty_struct *tty, struct tty_ldisc *old)
* the close of one side of a tty/pty pair, and eventually hangup. * the close of one side of a tty/pty pair, and eventually hangup.
*/ */
int tty_set_ldisc(struct tty_struct *tty, int ldisc) int tty_set_ldisc(struct tty_struct *tty, int disc)
{ {
int retval; int retval;
struct tty_ldisc *old_ldisc, *new_ldisc; struct tty_ldisc *old_ldisc, *new_ldisc;
new_ldisc = tty_ldisc_get(tty, ldisc); new_ldisc = tty_ldisc_get(tty, disc);
if (IS_ERR(new_ldisc)) if (IS_ERR(new_ldisc))
return PTR_ERR(new_ldisc); return PTR_ERR(new_ldisc);
@ -551,7 +551,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
} }
/* Check the no-op case */ /* Check the no-op case */
if (tty->ldisc->ops->num == ldisc) if (tty->ldisc->ops->num == disc)
goto out; goto out;
if (test_bit(TTY_HUPPED, &tty->flags)) { if (test_bit(TTY_HUPPED, &tty->flags)) {
@ -567,7 +567,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
/* Now set up the new line discipline. */ /* Now set up the new line discipline. */
tty->ldisc = new_ldisc; tty->ldisc = new_ldisc;
tty_set_termios_ldisc(tty, ldisc); tty_set_termios_ldisc(tty, disc);
retval = tty_ldisc_open(tty, new_ldisc); retval = tty_ldisc_open(tty, new_ldisc);
if (retval < 0) { if (retval < 0) {
@ -639,15 +639,15 @@ static void tty_reset_termios(struct tty_struct *tty)
/** /**
* tty_ldisc_reinit - reinitialise the tty ldisc * tty_ldisc_reinit - reinitialise the tty ldisc
* @tty: tty to reinit * @tty: tty to reinit
* @ldisc: line discipline to reinitialize * @disc: line discipline to reinitialize
* *
* Switch the tty to a line discipline and leave the ldisc * Switch the tty to a line discipline and leave the ldisc
* state closed * state closed
*/ */
static int tty_ldisc_reinit(struct tty_struct *tty, int ldisc) static int tty_ldisc_reinit(struct tty_struct *tty, int disc)
{ {
struct tty_ldisc *ld = tty_ldisc_get(tty, ldisc); struct tty_ldisc *ld = tty_ldisc_get(tty, disc);
if (IS_ERR(ld)) if (IS_ERR(ld))
return -1; return -1;
@ -658,7 +658,7 @@ static int tty_ldisc_reinit(struct tty_struct *tty, int ldisc)
* Switch the line discipline back * Switch the line discipline back
*/ */
tty->ldisc = ld; tty->ldisc = ld;
tty_set_termios_ldisc(tty, ldisc); tty_set_termios_ldisc(tty, disc);
return 0; return 0;
} }

2
include/linux/tty.h
View File

@ -570,7 +570,7 @@ static inline int tty_port_users(struct tty_port *port)
extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc); extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
extern int tty_unregister_ldisc(int disc); extern int tty_unregister_ldisc(int disc);
extern int tty_set_ldisc(struct tty_struct *tty, int ldisc); extern int tty_set_ldisc(struct tty_struct *tty, int disc);
extern int tty_ldisc_setup(struct tty_struct *tty, struct tty_struct *o_tty); extern int tty_ldisc_setup(struct tty_struct *tty, struct tty_struct *o_tty);
extern void tty_ldisc_release(struct tty_struct *tty); extern void tty_ldisc_release(struct tty_struct *tty);
extern void tty_ldisc_init(struct tty_struct *tty); extern void tty_ldisc_init(struct tty_struct *tty);