openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jiri Slaby 2008-04-30 00:53:41 -07:00 committed by Linus Torvalds
parent b4173f4575
commit 97506056bd
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/char/moxa.c
View File

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