projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[powerpc.git]
/
drivers
/
serial
/
21285.c
diff --git
a/drivers/serial/21285.c
b/drivers/serial/21285.c
index
0b10169
..
b5cf394
100644
(file)
--- a/
drivers/serial/21285.c
+++ b/
drivers/serial/21285.c
@@
-58,8
+58,7
@@
static const char serial21285_name[] = "Footbridge UART";
* int((BAUD_BASE - (baud >> 1)) / baud)
*/
* int((BAUD_BASE - (baud >> 1)) / baud)
*/
-static void
-serial21285_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void serial21285_stop_tx(struct uart_port *port)
{
if (tx_enabled(port)) {
disable_irq(IRQ_CONTX);
{
if (tx_enabled(port)) {
disable_irq(IRQ_CONTX);
@@
-67,8
+66,7
@@
serial21285_stop_tx(struct uart_port *port, unsigned int tty_stop)
}
}
}
}
-static void
-serial21285_start_tx(struct uart_port *port, unsigned int tty_start)
+static void serial21285_start_tx(struct uart_port *port)
{
if (!tx_enabled(port)) {
enable_irq(IRQ_CONTX);
{
if (!tx_enabled(port)) {
enable_irq(IRQ_CONTX);
@@
-148,7
+146,7
@@
static irqreturn_t serial21285_tx_chars(int irq, void *dev_id, struct pt_regs *r
goto out;
}
if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
goto out;
}
if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
- serial21285_stop_tx(port
, 0
);
+ serial21285_stop_tx(port);
goto out;
}
goto out;
}
@@
-164,7
+162,7
@@
static irqreturn_t serial21285_tx_chars(int irq, void *dev_id, struct pt_regs *r
uart_write_wakeup(port);
if (uart_circ_empty(xmit))
uart_write_wakeup(port);
if (uart_circ_empty(xmit))
- serial21285_stop_tx(port
, 0
);
+ serial21285_stop_tx(port);
out:
return IRQ_HANDLED;
out:
return IRQ_HANDLED;
@@
-465,7
+463,7
@@
static int __init serial21285_console_setup(struct console *co, char *options)
return uart_set_options(port, co, baud, parity, bits, flow);
}
return uart_set_options(port, co, baud, parity, bits, flow);
}
-
extern
struct uart_driver serial21285_reg;
+
static
struct uart_driver serial21285_reg;
static struct console serial21285_console =
{
static struct console serial21285_console =
{