projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SERIAL] Remove incorrect code from ioc4 serial driver
[powerpc.git]
/
drivers
/
serial
/
21285.c
diff --git
a/drivers/serial/21285.c
b/drivers/serial/21285.c
index
aec39fb
..
8c5c276
100644
(file)
--- a/
drivers/serial/21285.c
+++ b/
drivers/serial/21285.c
@@
-94,15
+94,6
@@
static irqreturn_t serial21285_rx_chars(int irq, void *dev_id, struct pt_regs *r
status = *CSR_UARTFLG;
while (!(status & 0x10) && max_count--) {
status = *CSR_UARTFLG;
while (!(status & 0x10) && max_count--) {
- if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
- if (tty->low_latency)
- tty_flip_buffer_push(tty);
- /*
- * If this failed then we will throw away the
- * bytes but must do so to clear interrupts
- */
- }
-
ch = *CSR_UARTDR;
flag = TTY_NORMAL;
port->icount.rx++;
ch = *CSR_UARTDR;
flag = TTY_NORMAL;
port->icount.rx++;
@@
-371,11
+362,11
@@
static struct uart_ops serial21285_ops = {
static struct uart_port serial21285_port = {
.mapbase = 0x42000160,
static struct uart_port serial21285_port = {
.mapbase = 0x42000160,
- .iotype =
SERIAL_
IO_MEM,
+ .iotype =
UP
IO_MEM,
.irq = NO_IRQ,
.fifosize = 16,
.ops = &serial21285_ops,
.irq = NO_IRQ,
.fifosize = 16,
.ops = &serial21285_ops,
- .flags =
ASYNC
_BOOT_AUTOCONF,
+ .flags =
UPF
_BOOT_AUTOCONF,
};
static void serial21285_setup_ports(void)
};
static void serial21285_setup_ports(void)
@@
-463,7
+454,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 =
{