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

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

staging: dgap: tty.c: removes read_cnt, real_raw and rawreadok 



This patch removes the use of read_cnt, real_raw and rawreadok.
These variables 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 c3dc9dc5

drivers/staging/dgap/dgap_tty.c

+14 −33
Original line number Diff line number Diff line
@@ -774,14 +774,11 @@ void dgap_input(struct channel_t *ch) 
	DPR_READ(("dgap_input start 2\n"));



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

	if (dgap_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);
@@ -863,21 +860,6 @@ void dgap_input(struct channel_t *ch) 
	 * On the other hand, if we are not raw, we need to go through

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

	 */

        if (dgap_rawreadok && tp->real_raw) {



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

		DGAP_UNLOCK(ch->ch_lock, lock_flags2);

		DGAP_UNLOCK(bd->bd_lock, lock_flags);



		DPR_READ(("dgap_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,31)

		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

	}

	else {

	if (I_PARMRK(tp) || I_BRKINT(tp) || I_INPCK(tp)) {

		dgap_parity_scan(ch, ch->ch_bd->flipbuf, ch->ch_bd->flipflagbuf, &len);
@@ -895,7 +877,6 @@ void dgap_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);