Commit 100013fa authored by Lidza Louina's avatar Lidza Louina Committed by Greg Kroah-Hartman
Browse files

staging: dgnc: removes read_cnt, real_raw, rawreadok and buf 



This patch removes the use of read_cnt, real_raw, buf and rawreadok. The
variable buf is never used in the code. The variables rawreadok read_cnt
and real_raw don't exist in the new API. Reading the data raw is no
longer supported by the tty layer.

Signed-off-by: default avatarLidza Louina <lidza.louina@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a31cefa2

drivers/staging/dgnc/dgnc_tty.c

+43 −112
Original line number Diff line number Diff line
@@ -683,7 +683,6 @@ void dgnc_input(struct channel_t *ch) 
	int flip_len;

	int len = 0;

	int n = 0;

	char *buf = NULL;

	int s = 0;

	int i = 0;
@@ -746,15 +745,11 @@ void dgnc_input(struct channel_t *ch) 


	DPR_READ(("dgnc_input start 2\n"));



	/* Decide how much data we can send into the tty layer */

	if (dgnc_rawreadok && tp->real_raw)

		flip_len = MYFLIPLEN;

	else

	flip_len = TTY_FLIPBUF_SIZE;



	/* Chop down the length, if needed */

	len = min(data_len, flip_len);

	len = min(len, (N_TTY_BUF_SIZE - 1) - tp->read_cnt);

	len = min(len, (N_TTY_BUF_SIZE - 1));



	ld = tty_ldisc_ref(tp);
@@ -807,69 +802,6 @@ void dgnc_input(struct channel_t *ch) 
	 * On the other hand, if we are not raw, we need to go through

	 * the new 2.6.16+ tty layer, which has its API more well defined.

	 */

	if (dgnc_rawreadok && tp->real_raw) {



		if (ch->ch_flags & CH_FLIPBUF_IN_USE) {

			DPR_READ(("DGNC - FLIPBUF in use. delaying input\n"));

			DGNC_UNLOCK(ch->ch_lock, lock_flags);

			if (ld)

				tty_ldisc_deref(ld);

			return;

		}



		ch->ch_flags |= CH_FLIPBUF_IN_USE;

		buf = ch->ch_bd->flipbuf;



		n = len;



		/*

		 * n now contains the most amount of data we can copy,

		 * bounded either by the flip buffer size or the amount

		 * of data the card actually has pending...

		 */

		while (n) {

			s = ((head >= tail) ? head : RQUEUESIZE) - tail;

			s = min(s, n);



			if (s <= 0)

				break;



			memcpy(buf, ch->ch_rqueue + tail, s);

			dgnc_sniff_nowait_nolock(ch, "USER READ", ch->ch_rqueue + tail, s);



			tail += s;

			buf += s;



			n -= s;

			/* Flip queue if needed */

			tail &= rmask;

		}



		ch->ch_r_tail = tail & rmask;

		ch->ch_e_tail = tail & rmask;



		dgnc_check_queue_flow_control(ch);



		/* !!! WE *MUST* LET GO OF ALL LOCKS BEFORE CALLING RECEIVE BUF !!! */



		DGNC_UNLOCK(ch->ch_lock, lock_flags);



		DPR_READ(("dgnc_input. %d real_raw len:%d calling receive_buf for buffer for board %d\n", 

			 __LINE__, len, ch->ch_bd->boardnum));



#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)

		tp->ldisc->ops->receive_buf(tp, ch->ch_bd->flipbuf, NULL, len);

#else

		tp->ldisc.ops->receive_buf(tp, ch->ch_bd->flipbuf, NULL, len);

#endif



		/* Allow use of channel flip buffer again */

		DGNC_LOCK(ch->ch_lock, lock_flags);

		ch->ch_flags &= ~CH_FLIPBUF_IN_USE;

		DGNC_UNLOCK(ch->ch_lock, lock_flags);



	}

	else {

	len = tty_buffer_request_room(tp->port, len);

	n = len;
@@ -922,7 +854,6 @@ void dgnc_input(struct channel_t *ch) 


	/* Tell the tty layer its okay to "eat" the data now */

	tty_flip_buffer_push(tp->port);

	}



	if (ld)

		tty_ldisc_deref(ld);