diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2004-10-31 14:48:44 +0000 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2004-10-31 14:48:44 +0000 |
| commit | e895faed18e9869b2a1eb0ce6b1ffef216194482 (patch) | |
| tree | 5b73789d97292e819120fe380b7346366fd40026 /drivers/serial | |
| parent | 33b42bcb383adb5ecf6f3a960cd283780bb31c71 (diff) | |
[SERIAL] serial_cs: Convert to use serial8250_{un,}register_port.
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_cs.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c index a36650b87fb2..e21f752cac49 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c @@ -40,8 +40,6 @@ #include <linux/slab.h> #include <linux/string.h> #include <linux/timer.h> -#include <linux/tty.h> -#include <linux/serial.h> #include <linux/serial_core.h> #include <linux/major.h> #include <asm/io.h> @@ -148,7 +146,7 @@ static void serial_remove(dev_link_t *link) */ if (info->link.state & DEV_CONFIG) { for (i = 0; i < info->ndev; i++) - unregister_serial(info->line[i]); + serial8250_unregister_port(info->line[i]); info->link.dev = NULL; @@ -304,21 +302,22 @@ static void serial_detach(dev_link_t * link) /*====================================================================*/ -static int setup_serial(struct serial_info * info, ioaddr_t port, int irq) +static int setup_serial(struct serial_info * info, ioaddr_t iobase, int irq) { - struct serial_struct serial; + struct uart_port port; int line; - memset(&serial, 0, sizeof (serial)); - serial.port = port; - serial.irq = irq; - serial.flags = UPF_SKIP_TEST | UPF_SHARE_IRQ; + memset(&port, 0, sizeof (struct uart_port)); + port.iobase = iobase; + port.irq = irq; + port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ; + port.uartclk = 1843200; if (buggy_uart) - serial.flags |= UPF_BUGGY_UART; - line = register_serial(&serial); + port.flags |= UPF_BUGGY_UART; + line = serial8250_register_port(&port); if (line < 0) { - printk(KERN_NOTICE "serial_cs: register_serial() at 0x%04lx," - " irq %d failed\n", (u_long) serial.port, serial.irq); + printk(KERN_NOTICE "serial_cs: serial8250_register_port() at " + "0x%04lx, irq %d failed\n", (u_long)iobase, irq); return -EINVAL; } |