Commit c6964e93 authored by Joey Pabalinas's avatar Joey Pabalinas Committed by Greg Kroah-Hartman

tty/nozomi: fix inconsistent indentation

Correct misaligned indentation and remove extraneous spaces.
Signed-off-by: default avatarJoey Pabalinas <joeypabalinas@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2ea0452c
...@@ -1686,12 +1686,12 @@ static int ntty_tiocmget(struct tty_struct *tty) ...@@ -1686,12 +1686,12 @@ static int ntty_tiocmget(struct tty_struct *tty)
/* Note: these could change under us but it is not clear this /* Note: these could change under us but it is not clear this
matters if so */ matters if so */
return (ctrl_ul->RTS ? TIOCM_RTS : 0) | return (ctrl_ul->RTS ? TIOCM_RTS : 0)
(ctrl_ul->DTR ? TIOCM_DTR : 0) | | (ctrl_ul->DTR ? TIOCM_DTR : 0)
(ctrl_dl->DCD ? TIOCM_CAR : 0) | | (ctrl_dl->DCD ? TIOCM_CAR : 0)
(ctrl_dl->RI ? TIOCM_RNG : 0) | | (ctrl_dl->RI ? TIOCM_RNG : 0)
(ctrl_dl->DSR ? TIOCM_DSR : 0) | | (ctrl_dl->DSR ? TIOCM_DSR : 0)
(ctrl_dl->CTS ? TIOCM_CTS : 0); | (ctrl_dl->CTS ? TIOCM_CTS : 0);
} }
/* Sets io controls parameters */ /* Sets io controls parameters */
...@@ -1722,10 +1722,10 @@ static int ntty_cflags_changed(struct port *port, unsigned long flags, ...@@ -1722,10 +1722,10 @@ static int ntty_cflags_changed(struct port *port, unsigned long flags,
const struct async_icount cnow = port->tty_icount; const struct async_icount cnow = port->tty_icount;
int ret; int ret;
ret = ((flags & TIOCM_RNG) && (cnow.rng != cprev->rng)) || ret = ((flags & TIOCM_RNG) && (cnow.rng != cprev->rng))
((flags & TIOCM_DSR) && (cnow.dsr != cprev->dsr)) || || ((flags & TIOCM_DSR) && (cnow.dsr != cprev->dsr))
((flags & TIOCM_CD) && (cnow.dcd != cprev->dcd)) || || ((flags & TIOCM_CD) && (cnow.dcd != cprev->dcd))
((flags & TIOCM_CTS) && (cnow.cts != cprev->cts)); || ((flags & TIOCM_CTS) && (cnow.cts != cprev->cts));
*cprev = cnow; *cprev = cnow;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment