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

Commit 016af53a authored by Alan Cox's avatar Alan Cox Committed by Live-CD User
Browse files

serial: kill USF_CLOSING_* definitions 



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: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b58d13a0

drivers/serial/serial_core.c

+3 −3
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ static int uart_get_info(struct uart_state *state, 
	tmp.xmit_fifo_size  = uport->fifosize;

	tmp.baud_base	    = uport->uartclk / 16;

	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 :

				port->closing_wait / 10;

	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);

	close_delay = new_serial.close_delay * 10;

	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
@@ -1307,7 +1307,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp) 
	 */

	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));



	/*

include/linux/serial_core.h

+0 −3
Original line number Diff line number Diff line
@@ -342,9 +342,6 @@ struct uart_port { 
struct uart_state {

	struct tty_port		port;



#define USF_CLOSING_WAIT_INF	(0)

#define USF_CLOSING_WAIT_NONE	(~0U)



	int			pm_state;

	struct circ_buf		xmit;