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

Commit 2c16a353 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

TTY: serial, remove dead code from 68328 



The code is dead at least since 2002. So remove it to not distort git
grep output (about port.tty usage).

Remove the whole do_softirq tasklet as it's noop now.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 55956216

drivers/tty/serial/68328serial.c

+0 −35
Original line number Original line Diff line number Diff line
@@ -235,22 +235,6 @@ static void batten_down_hatches(void) 




static void status_handle(struct m68k_serial *info, unsigned short status)

static void status_handle(struct m68k_serial *info, unsigned short status)

{

{

#if 0

	if(status & DCD) {

		if((info->port.tty->termios->c_cflag & CRTSCTS) &&

		   ((info->curregs[3] & AUTO_ENAB)==0)) {

			info->curregs[3] |= AUTO_ENAB;

			info->pendregs[3] |= AUTO_ENAB;

			write_zsreg(info->m68k_channel, 3, info->curregs[3]);

		}

	} else {

		if((info->curregs[3] & AUTO_ENAB)) {

			info->curregs[3] &= ~AUTO_ENAB;

			info->pendregs[3] &= ~AUTO_ENAB;

			write_zsreg(info->m68k_channel, 3, info->curregs[3]);

		}

	}

#endif

	/* If this is console input and this is a

	/* If this is console input and this is a

	 * 'break asserted' status change interrupt

	 * 'break asserted' status change interrupt

	 * see if we can drop into the debugger

	 * see if we can drop into the debugger
@@ -340,9 +324,6 @@ static void transmit_chars(struct m68k_serial *info) 
	info->xmit_tail = info->xmit_tail & (SERIAL_XMIT_SIZE-1);

	info->xmit_tail = info->xmit_tail & (SERIAL_XMIT_SIZE-1);

	info->xmit_cnt--;

	info->xmit_cnt--;





	if (info->xmit_cnt < WAKEUP_CHARS)

		schedule_work(&info->tqueue);



	if(info->xmit_cnt <= 0) {

	if(info->xmit_cnt <= 0) {

		/* All done for now... TX ints off */

		/* All done for now... TX ints off */

		uart->ustcnt &= ~USTCNT_TX_INTR_MASK;

		uart->ustcnt &= ~USTCNT_TX_INTR_MASK;
@@ -378,21 +359,6 @@ irqreturn_t rs_interrupt(int irq, void *dev_id) 
	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}





static void do_softint(struct work_struct *work)

{

	struct m68k_serial	*info = container_of(work, struct m68k_serial, tqueue);

	struct tty_struct	*tty;

	

	tty = info->tty;

	if (!tty)

		return;

#if 0

	if (clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event)) {

		tty_wakeup(tty);

	}

#endif   

}



static int startup(struct m68k_serial * info)

static int startup(struct m68k_serial * info)

{

{

	m68328_uart *uart = &uart_addr[info->line];

	m68328_uart *uart = &uart_addr[info->line];
@@ -1324,7 +1290,6 @@ rs68328_init(void) 
	    info->event = 0;

	    info->event = 0;

	    info->count = 0;

	    info->count = 0;

	    info->blocked_open = 0;

	    info->blocked_open = 0;

	    INIT_WORK(&info->tqueue, do_softint);

	    init_waitqueue_head(&info->open_wait);

	    init_waitqueue_head(&info->open_wait);

	    init_waitqueue_head(&info->close_wait);

	    init_waitqueue_head(&info->close_wait);

	    info->line = i;

	    info->line = i;

drivers/tty/serial/68328serial.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -158,7 +158,6 @@ struct m68k_serial { 
	int			xmit_head;

	int			xmit_head;

	int			xmit_tail;

	int			xmit_tail;

	int			xmit_cnt;

	int			xmit_cnt;

	struct work_struct	tqueue;

	wait_queue_head_t	open_wait;

	wait_queue_head_t	open_wait;

	wait_queue_head_t	close_wait;

	wait_queue_head_t	close_wait;

};

};