Commit 70d97a61 authored by Mark Hounschell's avatar Mark Hounschell Committed by Greg Kroah-Hartman

staging: dgap: fix a few 80+ char lines

This patch fixes a few 80+ char lines
as reported by checkpatch
Signed-off-by: default avatarMark Hounschell <markh@compro.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6ae46633
...@@ -1634,7 +1634,8 @@ static void dgap_sniff_nowait_nolock(struct channel_t *ch, uchar *text, ...@@ -1634,7 +1634,8 @@ static void dgap_sniff_nowait_nolock(struct channel_t *ch, uchar *text,
r = SNIFF_MAX - ch->ch_sniff_in; r = SNIFF_MAX - ch->ch_sniff_in;
if (r <= n) { if (r <= n) {
memcpy(ch->ch_sniff_buf + ch->ch_sniff_in, p, r); memcpy(ch->ch_sniff_buf +
ch->ch_sniff_in, p, r);
n -= r; n -= r;
ch->ch_sniff_in = 0; ch->ch_sniff_in = 0;
...@@ -4100,7 +4101,14 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd, ...@@ -4100,7 +4101,14 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
} }
} }
if ((arg == TCOFLUSH) || (arg == TCIOFLUSH)) { if ((arg != TCOFLUSH) && (arg != TCIOFLUSH)) {
/* pretend we didn't recognize this IOCTL */
DGAP_UNLOCK(ch->ch_lock, lock_flags2);
DGAP_UNLOCK(bd->bd_lock, lock_flags);
return -ENOIOCTLCMD;
}
ch->ch_flags &= ~CH_STOP; ch->ch_flags &= ~CH_STOP;
head = readw(&(ch->ch_bs->tx_head)); head = readw(&(ch->ch_bs->tx_head));
dgap_cmdw(ch, FLUSHTX, (u16) head, 0); dgap_cmdw(ch, FLUSHTX, (u16) head, 0);
...@@ -4120,14 +4128,8 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd, ...@@ -4120,14 +4128,8 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
DGAP_UNLOCK(ch->ch_lock, lock_flags2); DGAP_UNLOCK(ch->ch_lock, lock_flags2);
DGAP_UNLOCK(bd->bd_lock, lock_flags); DGAP_UNLOCK(bd->bd_lock, lock_flags);
tty_wakeup(tty); tty_wakeup(tty);
DGAP_LOCK(bd->bd_lock, lock_flags);
DGAP_LOCK(ch->ch_lock, lock_flags2);
}
/* pretend we didn't recognize this IOCTL */ /* pretend we didn't recognize this IOCTL */
DGAP_UNLOCK(ch->ch_lock, lock_flags2);
DGAP_UNLOCK(bd->bd_lock, lock_flags);
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
case TCSETSF: case TCSETSF:
...@@ -5852,7 +5854,8 @@ static int dgap_event(struct board_t *bd) ...@@ -5852,7 +5854,8 @@ static int dgap_event(struct board_t *bd)
if (ch->ch_flags & CH_RWAIT) { if (ch->ch_flags & CH_RWAIT) {
ch->ch_flags &= ~CH_RWAIT; ch->ch_flags &= ~CH_RWAIT;
wake_up_interruptible(&ch->ch_tun.un_flags_wait); wake_up_interruptible
(&ch->ch_tun.un_flags_wait);
} }
} }
...@@ -5872,8 +5875,10 @@ static int dgap_event(struct board_t *bd) ...@@ -5872,8 +5875,10 @@ static int dgap_event(struct board_t *bd)
if (ch->ch_tun.un_tty) { if (ch->ch_tun.un_tty) {
/* A break has been indicated */ /* A break has been indicated */
ch->ch_err_break++; ch->ch_err_break++;
tty_buffer_request_room(ch->ch_tun.un_tty->port, 1); tty_buffer_request_room
tty_insert_flip_char(ch->ch_tun.un_tty->port, 0, TTY_BREAK); (ch->ch_tun.un_tty->port, 1);
tty_insert_flip_char(ch->ch_tun.un_tty->port,
0, TTY_BREAK);
tty_flip_buffer_push(ch->ch_tun.un_tty->port); tty_flip_buffer_push(ch->ch_tun.un_tty->port);
} }
} }
......
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