Commit eef76d73 authored by Russell King's avatar Russell King

[SERIAL] Rename uart_event() to uart_write_wakeup()

uart_event() only has one purpose, which is to wake up any pending
writers via the line discipline.  Rename it to reflect its real
functionality, and drop EVT_WRITE_WAKEUP.
parent 1c58248d
...@@ -171,7 +171,7 @@ static void serial21285_tx_chars(int irq, void *dev_id, struct pt_regs *regs) ...@@ -171,7 +171,7 @@ static void serial21285_tx_chars(int irq, void *dev_id, struct pt_regs *regs)
} while (--count > 0 && !(*CSR_UARTFLG & 0x20)); } while (--count > 0 && !(*CSR_UARTFLG & 0x20));
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
uart_event(port, EVT_WRITE_WAKEUP); uart_write_wakeup(port);
if (uart_circ_empty(xmit)) if (uart_circ_empty(xmit))
serial21285_stop_tx(port, 0); serial21285_stop_tx(port, 0);
......
...@@ -839,7 +839,7 @@ static _INLINE_ void transmit_chars(struct uart_8250_port *up) ...@@ -839,7 +839,7 @@ static _INLINE_ void transmit_chars(struct uart_8250_port *up)
} while (--count > 0); } while (--count > 0);
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
uart_event(&up->port, EVT_WRITE_WAKEUP); uart_write_wakeup(&up->port);
DEBUG_INTR("THRE..."); DEBUG_INTR("THRE...");
......
...@@ -245,7 +245,7 @@ static void ambauart_tx_chars(struct uart_port *port) ...@@ -245,7 +245,7 @@ static void ambauart_tx_chars(struct uart_port *port)
} while (--count > 0); } while (--count > 0);
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
uart_event(port, EVT_WRITE_WAKEUP); uart_write_wakeup(port);
if (uart_circ_empty(xmit)) if (uart_circ_empty(xmit))
ambauart_stop_tx(port); ambauart_stop_tx(port);
......
...@@ -161,7 +161,7 @@ anakin_tx_chars(struct uart_port *port) ...@@ -161,7 +161,7 @@ anakin_tx_chars(struct uart_port *port)
anakin_transmit_buffer(port); anakin_transmit_buffer(port);
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
uart_event(port, EVT_WRITE_WAKEUP); uart_write_wakeup(port);
} }
static void static void
......
...@@ -209,7 +209,7 @@ static void clps711xuart_int_tx(int irq, void *dev_id, struct pt_regs *regs) ...@@ -209,7 +209,7 @@ static void clps711xuart_int_tx(int irq, void *dev_id, struct pt_regs *regs)
} while (--count > 0); } while (--count > 0);
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
uart_event(port, EVT_WRITE_WAKEUP); uart_write_wakeup(port);
if (uart_circ_empty(xmit)) if (uart_circ_empty(xmit))
clps711xuart_stop_tx(port); clps711xuart_stop_tx(port);
......
...@@ -65,7 +65,7 @@ static void uart_wait_until_sent(struct tty_struct *tty, int timeout); ...@@ -65,7 +65,7 @@ static void uart_wait_until_sent(struct tty_struct *tty, int timeout);
* This routine is used by the interrupt handler to schedule processing in * This routine is used by the interrupt handler to schedule processing in
* the software interrupt portion of the driver. * the software interrupt portion of the driver.
*/ */
void uart_event(struct uart_port *port, int event) void uart_write_wakeup(struct uart_port *port)
{ {
struct uart_info *info = port->info; struct uart_info *info = port->info;
...@@ -2453,7 +2453,7 @@ void uart_unregister_port(struct uart_driver *drv, int line) ...@@ -2453,7 +2453,7 @@ void uart_unregister_port(struct uart_driver *drv, int line)
up(&port_sem); up(&port_sem);
} }
EXPORT_SYMBOL(uart_event); EXPORT_SYMBOL(uart_write_wakeup);
EXPORT_SYMBOL(uart_register_driver); EXPORT_SYMBOL(uart_register_driver);
EXPORT_SYMBOL(uart_unregister_driver); EXPORT_SYMBOL(uart_unregister_driver);
EXPORT_SYMBOL(uart_register_port); EXPORT_SYMBOL(uart_register_port);
......
...@@ -305,7 +305,7 @@ static void sa1100_tx_chars(struct sa1100_port *sport) ...@@ -305,7 +305,7 @@ static void sa1100_tx_chars(struct sa1100_port *sport)
} }
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
uart_event(&sport->port, EVT_WRITE_WAKEUP); uart_write_wakeup(&sport->port);
if (uart_circ_empty(xmit)) if (uart_circ_empty(xmit))
sa1100_stop_tx(&sport->port, 0); sa1100_stop_tx(&sport->port, 0);
......
...@@ -266,7 +266,7 @@ static void transmit_chars(struct uart_sunsab_port *up, ...@@ -266,7 +266,7 @@ static void transmit_chars(struct uart_sunsab_port *up,
writeb(SAB82532_CMDR_XF, &up->regs->w.cmdr); writeb(SAB82532_CMDR_XF, &up->regs->w.cmdr);
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
uart_event(&up->port, EVT_WRITE_WAKEUP); uart_write_wakeup(&up->port);
if (uart_circ_empty(xmit)) if (uart_circ_empty(xmit))
sunsab_stop_tx(&up->port, 0); sunsab_stop_tx(&up->port, 0);
......
...@@ -431,7 +431,7 @@ static _INLINE_ void transmit_chars(struct uart_sunsu_port *up) ...@@ -431,7 +431,7 @@ static _INLINE_ void transmit_chars(struct uart_sunsu_port *up)
} while (--count > 0); } while (--count > 0);
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
uart_event(&up->port, EVT_WRITE_WAKEUP); uart_write_wakeup(&up->port);
if (uart_circ_empty(xmit)) if (uart_circ_empty(xmit))
sunsu_stop_tx(&up->port, 0); sunsu_stop_tx(&up->port, 0);
......
...@@ -523,7 +523,7 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up, ...@@ -523,7 +523,7 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,
up->port.icount.tx++; up->port.icount.tx++;
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
uart_event(&up->port, EVT_WRITE_WAKEUP); uart_write_wakeup(&up->port);
if (!uart_circ_empty(xmit)) if (!uart_circ_empty(xmit))
return; return;
......
...@@ -215,7 +215,7 @@ static void uart00_tx_chars(struct uart_port *port) ...@@ -215,7 +215,7 @@ static void uart00_tx_chars(struct uart_port *port)
} while (--count > 0); } while (--count > 0);
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
uart_event(port, EVT_WRITE_WAKEUP); uart_write_wakeup(port);
if (uart_circ_empty(xmit)) if (uart_circ_empty(xmit))
uart00_stop_tx(port, 0); uart00_stop_tx(port, 0);
......
...@@ -247,8 +247,6 @@ struct uart_info { ...@@ -247,8 +247,6 @@ struct uart_info {
/* number of characters left in xmit buffer before we ask for more */ /* number of characters left in xmit buffer before we ask for more */
#define WAKEUP_CHARS 256 #define WAKEUP_CHARS 256
#define EVT_WRITE_WAKEUP 0
struct module; struct module;
struct tty_driver; struct tty_driver;
...@@ -269,7 +267,7 @@ struct uart_driver { ...@@ -269,7 +267,7 @@ struct uart_driver {
struct tty_driver *tty_driver; struct tty_driver *tty_driver;
}; };
void uart_event(struct uart_port *port, int event); void uart_write_wakeup(struct uart_port *port);
struct uart_port *uart_get_console(struct uart_port *ports, int nr, struct uart_port *uart_get_console(struct uart_port *ports, int nr,
struct console *c); struct console *c);
void uart_parse_options(char *options, int *baud, int *parity, int *bits, void uart_parse_options(char *options, int *baud, int *parity, int *bits,
...@@ -380,7 +378,7 @@ uart_handle_cts_change(struct uart_port *port, unsigned int status) ...@@ -380,7 +378,7 @@ uart_handle_cts_change(struct uart_port *port, unsigned int status)
if (status) { if (status) {
tty->hw_stopped = 0; tty->hw_stopped = 0;
port->ops->start_tx(port, 0); port->ops->start_tx(port, 0);
uart_event(port, EVT_WRITE_WAKEUP); uart_write_wakeup(port);
} }
} else { } else {
if (!status) { if (!status) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment