Commit 300a6204 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

n_tty: clean up coding style

Now the main work is done its polishing time
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a88a69c9
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/audit.h> #include <linux/audit.h>
#include <linux/file.h> #include <linux/file.h>
#include <linux/uaccess.h>
#include <asm/uaccess.h>
#include <asm/system.h> #include <asm/system.h>
/* number of characters left in xmit buffer before select has we have room */ /* number of characters left in xmit buffer before select has we have room */
...@@ -417,8 +417,7 @@ static ssize_t process_output_block(struct tty_struct *tty, ...@@ -417,8 +417,7 @@ static ssize_t process_output_block(struct tty_struct *tty,
mutex_lock(&tty->output_lock); mutex_lock(&tty->output_lock);
space = tty_write_room(tty); space = tty_write_room(tty);
if (!space) if (!space) {
{
mutex_unlock(&tty->output_lock); mutex_unlock(&tty->output_lock);
return 0; return 0;
} }
...@@ -621,7 +620,8 @@ static void process_echoes(struct tty_struct *tty) ...@@ -621,7 +620,8 @@ static void process_echoes(struct tty_struct *tty)
} else { } else {
int retval; int retval;
if ((retval = do_output_char(c, tty, space)) < 0) retval = do_output_char(c, tty, space);
if (retval < 0)
break; break;
space -= retval; space -= retval;
cp += 1; cp += 1;
...@@ -675,8 +675,7 @@ static void add_echo_byte(unsigned char c, struct tty_struct *tty) ...@@ -675,8 +675,7 @@ static void add_echo_byte(unsigned char c, struct tty_struct *tty)
* Since the buffer start position needs to be advanced, * Since the buffer start position needs to be advanced,
* be sure to step by a whole operation byte group. * be sure to step by a whole operation byte group.
*/ */
if (tty->echo_buf[tty->echo_pos] == ECHO_OP_START) if (tty->echo_buf[tty->echo_pos] == ECHO_OP_START) {
{
if (tty->echo_buf[(tty->echo_pos + 1) & if (tty->echo_buf[(tty->echo_pos + 1) &
(N_TTY_BUF_SIZE - 1)] == (N_TTY_BUF_SIZE - 1)] ==
ECHO_OP_ERASE_TAB) { ECHO_OP_ERASE_TAB) {
...@@ -959,8 +958,7 @@ static void eraser(unsigned char c, struct tty_struct *tty) ...@@ -959,8 +958,7 @@ static void eraser(unsigned char c, struct tty_struct *tty)
if (c == '\t') { if (c == '\t') {
after_tab = 1; after_tab = 1;
break; break;
} } else if (iscntrl(c)) {
else if (iscntrl(c)) {
if (L_ECHOCTL(tty)) if (L_ECHOCTL(tty))
num_chars += 2; num_chars += 2;
} else if (!is_continuation(c, tty)) { } else if (!is_continuation(c, tty)) {
...@@ -1112,7 +1110,7 @@ static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c) ...@@ -1112,7 +1110,7 @@ static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c)
if (I_ISTRIP(tty)) if (I_ISTRIP(tty))
c &= 0x7f; c &= 0x7f;
if (I_IUCLC(tty) && L_IEXTEN(tty)) if (I_IUCLC(tty) && L_IEXTEN(tty))
c=tolower(c); c = tolower(c);
if (tty->stopped && !tty->flow_stopped && I_IXON(tty) && if (tty->stopped && !tty->flow_stopped && I_IXON(tty) &&
I_IXANY(tty) && c != START_CHAR(tty) && c != STOP_CHAR(tty) && I_IXANY(tty) && c != START_CHAR(tty) && c != STOP_CHAR(tty) &&
...@@ -1126,8 +1124,7 @@ static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c) ...@@ -1126,8 +1124,7 @@ static inline void n_tty_receive_char(struct tty_struct *tty, unsigned char c)
if (c == START_CHAR(tty)) { if (c == START_CHAR(tty)) {
start_tty(tty); start_tty(tty);
process_echoes(tty); process_echoes(tty);
} } else if (c == STOP_CHAR(tty))
else if (c == STOP_CHAR(tty))
stop_tty(tty); stop_tty(tty);
} }
return; return;
......
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