Kars, Geert,
Here's a patch which converts 8250_hp300 to use serial8250_register_port
and serial8250_unregister_port, rather than register_serial/
unregister_serial.
The 8250-variants allow you to associate the struct device with the port,
allowing sysfs to indicate which device owns which serial port. Plus, we
stop using a potentially obsolete (and functionally inferior) function.
This patch is untested; please test, and send bug fixes.
Note: if you need power management, that should come via your device
driver, calling serial8250_suspend_port() / serial8250_resume_port()
as appropriate.
Thanks.
diff -up -x BitKeeper -x ChangeSet -x SCCS -x _xlk -x *.orig -x *.rej orig/drivers/serial/8250_hp300.c linux/drivers/serial/8250_hp300.c
--- orig/drivers/serial/8250_hp300.c Thu Mar 24 12:26:42 2005
+++ linux/drivers/serial/8250_hp300.c Thu Mar 24 13:12:33 2005
@@ -163,7 +163,7 @@ int __init hp300_setup_serial_console(vo
static int __devinit hpdca_init_one(struct dio_dev *d,
const struct dio_device_id *ent)
{
- struct serial_struct serial_req;
+ struct uart_port port;
int line;
#ifdef CONFIG_SERIAL_8250_CONSOLE
@@ -172,17 +172,18 @@ static int __devinit hpdca_init_one(stru
return 0;
}
#endif
- memset(&serial_req, 0, sizeof(struct serial_struct));
+ memset(&port, 0, sizeof(struct uart_port));
/* Memory mapped I/O */
- serial_req.io_type = SERIAL_IO_MEM;
- serial_req.flags = UPF_SKIP_TEST | UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF;
- serial_req.irq = d->ipl;
- serial_req.baud_base = HPDCA_BAUD_BASE;
- serial_req.iomap_base = (d->resource.start + UART_OFFSET);
- serial_req.iomem_base = (char *)(serial_req.iomap_base + DIO_VIRADDRBASE);
- serial_req.iomem_reg_shift = 1;
- line = register_serial(&serial_req);
+ port.iotype = UPIO_MEM;
+ port.flags = UPF_SKIP_TEST | UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF;
+ port.irq = d->ipl;
+ port.uartclk = HPDCA_BAUD_BASE * 16;
+ port.mapbase = (d->resource.start + UART_OFFSET);
+ port.membase = (char *)(serial_req.iomap_base + DIO_VIRADDRBASE);
+ port.regshift = 1;
+ port.dev = &d->dev;
+ line = serial8250_register_port(&port);
if (line < 0) {
printk(KERN_NOTICE "8250_hp300: register_serial() DCA scode %d"
@@ -209,7 +210,7 @@ static int __init hp300_8250_init(void)
#ifdef CONFIG_HPAPCI
int line;
unsigned long base;
- struct serial_struct serial_req;
+ struct uart_port uport;
struct hp300_port *port;
int i;
#endif
@@ -251,25 +252,25 @@ static int __init hp300_8250_init(void)
if (!port)
return -ENOMEM;
- memset(&serial_req, 0, sizeof(struct serial_struct));
+ memset(&uport, 0, sizeof(struct uart_port));
base = (FRODO_BASE + FRODO_APCI_OFFSET(i));
/* Memory mapped I/O */
- serial_req.io_type = SERIAL_IO_MEM;
- serial_req.flags = UPF_SKIP_TEST | UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF;
+ uport.iotype = UPIO_MEM;
+ uport.flags = UPF_SKIP_TEST | UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF;
/* XXX - no interrupt support yet */
- serial_req.irq = 0;
- serial_req.baud_base = HPAPCI_BAUD_BASE;
- serial_req.iomap_base = base;
- serial_req.iomem_base = (char *)(serial_req.iomap_base + DIO_VIRADDRBASE);
- serial_req.iomem_reg_shift = 2;
+ uport.irq = 0;
+ uport.baud_base = HPAPCI_BAUD_BASE * 16;
+ uport.mapbase = base;
+ uport.membase = (char *)(base + DIO_VIRADDRBASE);
+ uport.regshift = 2;
- line = register_serial(&serial_req);
+ line = serial8250_register_port(&uport);
if (line < 0) {
printk(KERN_NOTICE "8250_hp300: register_serial() APCI %d"
- " irq %d failed\n", i, serial_req.irq);
+ " irq %d failed\n", i, uport.irq);
kfree(port);
continue;
}
@@ -299,7 +300,7 @@ static void __devexit hpdca_remove_one(s
/* Disable board-interrupts */
out_8(d->resource.start + DIO_VIRADDRBASE + DCA_IC, 0);
}
- unregister_serial(line);
+ serial8250_unregister_port(line);
}
#endif
@@ -309,7 +310,7 @@ static void __exit hp300_8250_exit(void)
struct hp300_port *port, *to_free;
for (port = hp300_ports; port; ) {
- unregister_serial(port->line);
+ serial8250_unregister_port(port->line);
to_free = port;
port = port->next;
kfree(to_free);
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 Serial core
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
