aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2007-07-16 02:40:18 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 12:05:44 -0400
commit6804396f1b66c504bac1267d71a857f7a1d1e9dd (patch)
treeb92ab418e286341ce980906ec6b011972b0aa979
parent5a52bd4a2dcb570333ce6fe2e16cd311650dbdc8 (diff)
Char: tty_ioctl, little whitespace cleanup
tty_ioctl, little whitespace cleanup the point is to make while (++i < n_baud_table); clear and assign it to the do { } loop Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/char/tty_ioctl.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index 2b6a3847a9ee..3423e9ee6481 100644
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -261,13 +261,12 @@ void tty_termios_encode_baud_rate(struct ktermios *termios, speed_t ibaud, speed
261 termios->c_cflag |= (baud_bits[i] << IBSHIFT); 261 termios->c_cflag |= (baud_bits[i] << IBSHIFT);
262 ifound = i; 262 ifound = i;
263 } 263 }
264 } 264 } while (++i < n_baud_table);
265 while(++i < n_baud_table);
266 if (ofound == -1) 265 if (ofound == -1)
267 termios->c_cflag |= BOTHER; 266 termios->c_cflag |= BOTHER;
268 /* Set exact input bits only if the input and output differ or the 267 /* Set exact input bits only if the input and output differ or the
269 user already did */ 268 user already did */
270 if (ifound == -1 && (ibaud != obaud || ibinput)) 269 if (ifound == -1 && (ibaud != obaud || ibinput))
271 termios->c_cflag |= (BOTHER << IBSHIFT); 270 termios->c_cflag |= (BOTHER << IBSHIFT);
272} 271}
273 272
@@ -560,7 +559,7 @@ static int set_sgttyb(struct tty_struct * tty, struct sgttyb __user * sgttyb)
560 return -EFAULT; 559 return -EFAULT;
561 560
562 mutex_lock(&tty->termios_mutex); 561 mutex_lock(&tty->termios_mutex);
563 termios = *tty->termios; 562 termios = *tty->termios;
564 termios.c_cc[VERASE] = tmp.sg_erase; 563 termios.c_cc[VERASE] = tmp.sg_erase;
565 termios.c_cc[VKILL] = tmp.sg_kill; 564 termios.c_cc[VKILL] = tmp.sg_kill;
566 set_sgflags(&termios, tmp.sg_flags); 565 set_sgflags(&termios, tmp.sg_flags);