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

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

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

drivers/staging/dgap/dgap.c

+30 −25
Original line number Diff line number Diff line
@@ -1634,7 +1634,8 @@ static void dgap_sniff_nowait_nolock(struct channel_t *ch, uchar *text, 
			r = SNIFF_MAX - ch->ch_sniff_in;



			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;

				ch->ch_sniff_in = 0;
@@ -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;

		head = readw(&(ch->ch_bs->tx_head));

		dgap_cmdw(ch, FLUSHTX, (u16) head, 0);
@@ -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(bd->bd_lock, lock_flags);

		tty_wakeup(tty);

			DGAP_LOCK(bd->bd_lock, lock_flags);

			DGAP_LOCK(ch->ch_lock, lock_flags2);

		}



		/* pretend we didn't recognize this IOCTL */

		DGAP_UNLOCK(ch->ch_lock, lock_flags2);

		DGAP_UNLOCK(bd->bd_lock, lock_flags);



		return -ENOIOCTLCMD;



	case TCSETSF:
@@ -5852,7 +5854,8 @@ static int dgap_event(struct board_t *bd) 
			if (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) 
			if (ch->ch_tun.un_tty) {

				/* A break has been indicated */

				ch->ch_err_break++;

				tty_buffer_request_room(ch->ch_tun.un_tty->port, 1);

				tty_insert_flip_char(ch->ch_tun.un_tty->port, 0, TTY_BREAK);

				tty_buffer_request_room

					(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);

			}

		}