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

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

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

drivers/tty/nozomi.c

+38 −38
Original line number Diff line number Diff line
@@ -1686,12 +1686,12 @@ static int ntty_tiocmget(struct tty_struct *tty) 


	/* Note: these could change under us but it is not clear this

	   matters if so */

	return	(ctrl_ul->RTS ? TIOCM_RTS : 0) |

		(ctrl_ul->DTR ? TIOCM_DTR : 0) |

		(ctrl_dl->DCD ? TIOCM_CAR : 0) |

		(ctrl_dl->RI  ? TIOCM_RNG : 0) |

		(ctrl_dl->DSR ? TIOCM_DSR : 0) |

		(ctrl_dl->CTS ? TIOCM_CTS : 0);

	return (ctrl_ul->RTS ? TIOCM_RTS : 0)

		| (ctrl_ul->DTR ? TIOCM_DTR : 0)

		| (ctrl_dl->DCD ? TIOCM_CAR : 0)

		| (ctrl_dl->RI  ? TIOCM_RNG : 0)

		| (ctrl_dl->DSR ? TIOCM_DSR : 0)

		| (ctrl_dl->CTS ? TIOCM_CTS : 0);

}



/* Sets io controls parameters */
@@ -1722,10 +1722,10 @@ static int ntty_cflags_changed(struct port *port, unsigned long flags, 
	const struct async_icount cnow = port->tty_icount;

	int ret;



	ret =	((flags & TIOCM_RNG) && (cnow.rng != cprev->rng)) ||

		((flags & TIOCM_DSR) && (cnow.dsr != cprev->dsr)) ||

		((flags & TIOCM_CD)  && (cnow.dcd != cprev->dcd)) ||

		((flags & TIOCM_CTS) && (cnow.cts != cprev->cts));

	ret = ((flags & TIOCM_RNG) && (cnow.rng != cprev->rng))

		|| ((flags & TIOCM_DSR) && (cnow.dsr != cprev->dsr))

		|| ((flags & TIOCM_CD)  && (cnow.dcd != cprev->dcd))

		|| ((flags & TIOCM_CTS) && (cnow.cts != cprev->cts));



	*cprev = cnow;