kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

serial: kill USF_CLOSING_* definitions

Browse source 
The serial layer for some reason uses different defines for the special
case close delays and then conditionally switches to/from the normal ones
in the ioctls.

Remove this rather pointless abstraction

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox 2009-09-19 13:13:32 -07:00 committed by Live-CD User
parent b58d13a021
commit 016af53a6d
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/serial/serial_core.c
View file

@ -652,7 +652,7 @@ static int uart_get_info(struct uart_state *state,
tmp.xmit_fifo_size = uport->fifosize; tmp.xmit_fifo_size = uport->fifosize;
tmp.baud_base = uport->uartclk / 16; tmp.baud_base = uport->uartclk / 16;
tmp.close_delay = port->close_delay / 10; tmp.close_delay = port->close_delay / 10;
tmp.closing_wait = port->closing_wait == USF_CLOSING_WAIT_NONE ? tmp.closing_wait = port->closing_wait == ASYNC_CLOSING_WAIT_NONE ?
ASYNC_CLOSING_WAIT_NONE : ASYNC_CLOSING_WAIT_NONE :
port->closing_wait / 10; port->closing_wait / 10;
tmp.custom_divisor = uport->custom_divisor; tmp.custom_divisor = uport->custom_divisor;
@ -690,7 +690,7 @@ static int uart_set_info(struct uart_state *state,
new_serial.irq = irq_canonicalize(new_serial.irq); new_serial.irq = irq_canonicalize(new_serial.irq);
close_delay = new_serial.close_delay * 10; close_delay = new_serial.close_delay * 10;
closing_wait = new_serial.closing_wait == ASYNC_CLOSING_WAIT_NONE ? closing_wait = new_serial.closing_wait == ASYNC_CLOSING_WAIT_NONE ?
USF_CLOSING_WAIT_NONE : new_serial.closing_wait * 10; ASYNC_CLOSING_WAIT_NONE : new_serial.closing_wait * 10;
/* /*
* This semaphore protects port->count. It is also * This semaphore protects port->count. It is also
@ -1307,7 +1307,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
*/ */
tty->closing = 1; tty->closing = 1;
if (port->closing_wait != USF_CLOSING_WAIT_NONE) if (port->closing_wait != ASYNC_CLOSING_WAIT_NONE)
tty_wait_until_sent(tty, msecs_to_jiffies(port->closing_wait)); tty_wait_until_sent(tty, msecs_to_jiffies(port->closing_wait));
/* /*

3
include/linux/serial_core.h
View file

@ -342,9 +342,6 @@ struct uart_port {
struct uart_state { struct uart_state {
struct tty_port port; struct tty_port port;
#define USF_CLOSING_WAIT_INF (0)
#define USF_CLOSING_WAIT_NONE (~0U)
int pm_state; int pm_state;
struct circ_buf xmit; struct circ_buf xmit;