Char: moxa, remove unused port entries

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Tested-by: Oyvind Aabling <Oyvind.Aabling@uni-c.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index ae5433c581615791e8ecc5ba24c69fe568dd7dcb..c440ec5426861778ce2ca38cf982686aeda6627e 100644 (file)
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -131,10 +131,8 @@ struct moxa_port {
        struct moxa_board_conf *board;
        int type;
        int close_delay;
-       unsigned short closing_wait;
        int count;
        int blocked_open;
-       long event; /* long req'd for set_bit --RR */
        int asyncflags;
        unsigned long statusflags;
        struct tty_struct *tty;
@@ -147,7 +145,6 @@ struct moxa_port {
        char chkPort;
        char lineCtrl;
        void __iomem *tableAddr;
-       long curBaud;
        char DCDState;
        char lowChkFlag;
 
@@ -515,7 +512,6 @@ static int moxa_load_code(struct moxa_board_conf *brd, const void *ptr,
                for (i = 0; i < brd->numPorts; i++, port++) {
                        port->board = brd;
                        port->chkPort = 1;
-                       port->curBaud = 9600L;
                        port->DCDState = 0;
                        port->tableAddr = baseAddr + Extern_table +
                                        Extern_size * i;
@@ -535,7 +531,6 @@ static int moxa_load_code(struct moxa_board_conf *brd, const void *ptr,
                for (i = 0; i < brd->numPorts; i++, port++) {
                        port->board = brd;
                        port->chkPort = 1;
-                       port->curBaud = 9600L;
                        port->DCDState = 0;
                        port->tableAddr = baseAddr + Extern_table +
                                        Extern_size * i;
@@ -823,7 +818,6 @@ static int __init moxa_init(void)
        for (i = 0, ch = moxa_ports; i < MAX_PORTS; i++, ch++) {
                ch->type = PORT_16550A;
                ch->close_delay = 5 * HZ / 10;
-               ch->closing_wait = 30 * HZ;
                ch->cflag = B9600 | CS8 | CREAD | CLOCAL | HUPCL;
                init_waitqueue_head(&ch->open_wait);
                init_completion(&ch->close_wait);
@@ -1006,7 +1000,6 @@ static void moxa_close(struct tty_struct *tty, struct file *filp)
        tty_ldisc_flush(tty);
                        
        tty->closing = 0;
-       ch->event = 0;
        ch->tty = NULL;
        if (ch->blocked_open) {
                if (ch->close_delay) {
@@ -1270,7 +1263,6 @@ static void moxa_hangup(struct tty_struct *tty)
 
        moxa_flush_buffer(tty);
        moxa_shut_down(ch);
-       ch->event = 0;
        ch->count = 0;
        ch->asyncflags &= ~ASYNC_NORMAL_ACTIVE;
        ch->tty = NULL;
@@ -2079,7 +2071,6 @@ static long MoxaPortSetBaud(struct moxa_port *port, long baud)
        val = clock / baud;
        moxafunc(ofsAddr, FC_SetBaud, val);
        baud = clock / val;
-       port->curBaud = baud;
        return (baud);
 }
 
@@ -2457,7 +2448,6 @@ static int moxa_get_serial_info(struct moxa_port *info,
        tmp.flags = info->asyncflags;
        tmp.baud_base = 921600;
        tmp.close_delay = info->close_delay;
-       tmp.closing_wait = info->closing_wait;
        tmp.custom_divisor = 0;
        tmp.hub6 = 0;
        if(copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
@@ -2487,7 +2477,6 @@ static int moxa_set_serial_info(struct moxa_port *info,
                        return (-EPERM);
        } else {
                info->close_delay = new_serial.close_delay * HZ / 100;
-               info->closing_wait = new_serial.closing_wait * HZ / 100;
        }
 
        new_serial.flags = (new_serial.flags & ~ASYNC_FLAGS);