2007-08-08 13:31:36

by Alan

Subject: [PATCH] jsm: Remove further unneeded crud

Remove some remaining vestiges of the old hacks jsm had to work around
the old tty buffering. With the new tty buffering it simply doesn't
matter any more.

Signed-off-by: Alan Cox <[email protected]>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.23rc1-mm1/drivers/serial/jsm/jsm_tty.c linux-2.6.23rc1-mm1/drivers/serial/jsm/jsm_tty.c
--- linux.vanilla-2.6.23rc1-mm1/drivers/serial/jsm/jsm_tty.c 2007-07-26 15:01:46.000000000 +0100
+++ linux-2.6.23rc1-mm1/drivers/serial/jsm/jsm_tty.c 2007-08-08 11:49:49.000000000 +0100
@@ -500,7 +500,6 @@
{
struct jsm_board *bd;
struct tty_struct *tp;
- struct tty_ldisc *ld;
u32 rmask;
u16 head;
u16 tail;
@@ -574,45 +573,13 @@

jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "start 2\n");

- /*
- * If the rxbuf is empty and we are not throttled, put as much
- * as we can directly into the linux TTY buffer.
- *
- */
- flip_len = TTY_FLIPBUF_SIZE;
-
- len = min(data_len, flip_len);
- len = min(len, (N_TTY_BUF_SIZE - 1) - tp->read_cnt);
- ld = tty_ldisc_ref(tp);
-
- /*
- * If we were unable to get a reference to the ld,
- * don't flush our buffer, and act like the ld doesn't
- * have any space to put the data right now.
- */
- if (!ld) {
- len = 0;
- } else {
- /*
- * If ld doesn't have a pointer to a receive_buf function,
- * flush the data, then act like the ld doesn't have any
- * space to put the data right now.
- */
- if (!ld->receive_buf) {
- ch->ch_r_head = ch->ch_r_tail;
- len = 0;
- }
- }
-
- if (len <= 0) {
+ if (data_len <= 0) {
spin_unlock_irqrestore(&ch->ch_lock, lock_flags);
jsm_printk(READ, INFO, &ch->ch_bd->pci_dev, "jsm_input 1\n");
- if (ld)
- tty_ldisc_deref(ld);
return;
}

- len = tty_buffer_request_room(tp, len);
+ len = tty_buffer_request_room(tp, data_len);
n = len;

/*
@@ -647,7 +614,7 @@
else if (*(ch->ch_equeue +tail +i) & UART_LSR_FE)
tty_insert_flip_char(tp, *(ch->ch_rqueue +tail +i), TTY_FRAME);
else
- tty_insert_flip_char(tp, *(ch->ch_rqueue +tail +i), TTY_NORMAL);
+ tty_insert_flip_char(tp, *(ch->ch_rqueue +tail +i), TTY_NORMAL);
}
} else {
tty_insert_flip_string(tp, ch->ch_rqueue + tail, s) ;
@@ -666,9 +633,6 @@
/* Tell the tty layer its okay to "eat" the data now */
tty_flip_buffer_push(tp);

- if (ld)
- tty_ldisc_deref(ld);
-
jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, "finish\n");
}

2007-08-08 16:48:12

by Kilau, Scott

Subject: RE: [PATCH] jsm: Remove further unneeded crud

>
> Remove some remaining vestiges of the old hacks jsm had to work around
> the old tty buffering. With the new tty buffering it simply doesn't
> matter any more.
>
> Signed-off-by: Alan Cox <[email protected]>

Thanks Alan for helping cleaning up jsm.

Acked-by: Scott Kilau <[email protected]>