aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/tty/serial/68328serial.c35
-rw-r--r--drivers/tty/serial/68328serial.h1
2 files changed, 0 insertions, 36 deletions
diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c
index e0a77540b8ca..f54923186969 100644
--- a/drivers/tty/serial/68328serial.c
+++ b/drivers/tty/serial/68328serial.c
@@ -235,22 +235,6 @@ static void batten_down_hatches(void)
235 235
236static void status_handle(struct m68k_serial *info, unsigned short status) 236static void status_handle(struct m68k_serial *info, unsigned short status)
237{ 237{
238#if 0
239 if(status & DCD) {
240 if((info->port.tty->termios->c_cflag & CRTSCTS) &&
241 ((info->curregs[3] & AUTO_ENAB)==0)) {
242 info->curregs[3] |= AUTO_ENAB;
243 info->pendregs[3] |= AUTO_ENAB;
244 write_zsreg(info->m68k_channel, 3, info->curregs[3]);
245 }
246 } else {
247 if((info->curregs[3] & AUTO_ENAB)) {
248 info->curregs[3] &= ~AUTO_ENAB;
249 info->pendregs[3] &= ~AUTO_ENAB;
250 write_zsreg(info->m68k_channel, 3, info->curregs[3]);
251 }
252 }
253#endif
254 /* If this is console input and this is a 238 /* If this is console input and this is a
255 * 'break asserted' status change interrupt 239 * 'break asserted' status change interrupt
256 * see if we can drop into the debugger 240 * see if we can drop into the debugger
@@ -340,9 +324,6 @@ static void transmit_chars(struct m68k_serial *info)
340 info->xmit_tail = info->xmit_tail & (SERIAL_XMIT_SIZE-1); 324 info->xmit_tail = info->xmit_tail & (SERIAL_XMIT_SIZE-1);
341 info->xmit_cnt--; 325 info->xmit_cnt--;
342 326
343 if (info->xmit_cnt < WAKEUP_CHARS)
344 schedule_work(&info->tqueue);
345
346 if(info->xmit_cnt <= 0) { 327 if(info->xmit_cnt <= 0) {
347 /* All done for now... TX ints off */ 328 /* All done for now... TX ints off */
348 uart->ustcnt &= ~USTCNT_TX_INTR_MASK; 329 uart->ustcnt &= ~USTCNT_TX_INTR_MASK;
@@ -378,21 +359,6 @@ irqreturn_t rs_interrupt(int irq, void *dev_id)
378 return IRQ_HANDLED; 359 return IRQ_HANDLED;
379} 360}
380 361
381static void do_softint(struct work_struct *work)
382{
383 struct m68k_serial *info = container_of(work, struct m68k_serial, tqueue);
384 struct tty_struct *tty;
385
386 tty = info->tty;
387 if (!tty)
388 return;
389#if 0
390 if (clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event)) {
391 tty_wakeup(tty);
392 }
393#endif
394}
395
396static int startup(struct m68k_serial * info) 362static int startup(struct m68k_serial * info)
397{ 363{
398 m68328_uart *uart = &uart_addr[info->line]; 364 m68328_uart *uart = &uart_addr[info->line];
@@ -1324,7 +1290,6 @@ rs68328_init(void)
1324 info->event = 0; 1290 info->event = 0;
1325 info->count = 0; 1291 info->count = 0;
1326 info->blocked_open = 0; 1292 info->blocked_open = 0;
1327 INIT_WORK(&info->tqueue, do_softint);
1328 init_waitqueue_head(&info->open_wait); 1293 init_waitqueue_head(&info->open_wait);
1329 init_waitqueue_head(&info->close_wait); 1294 init_waitqueue_head(&info->close_wait);
1330 info->line = i; 1295 info->line = i;
diff --git a/drivers/tty/serial/68328serial.h b/drivers/tty/serial/68328serial.h
index 8c9c3c0745db..3d2faabd766f 100644
--- a/drivers/tty/serial/68328serial.h
+++ b/drivers/tty/serial/68328serial.h
@@ -158,7 +158,6 @@ struct m68k_serial {
158 int xmit_head; 158 int xmit_head;
159 int xmit_tail; 159 int xmit_tail;
160 int xmit_cnt; 160 int xmit_cnt;
161 struct work_struct tqueue;
162 wait_queue_head_t open_wait; 161 wait_queue_head_t open_wait;
163 wait_queue_head_t close_wait; 162 wait_queue_head_t close_wait;
164}; 163};