bk://bk.arm.linux.org.uk/linux-2.6-serial arjan@nl.rmk.(none)|ChangeSet|20041024143410|13699 arjan # This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/10/26 18:53:00-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-serial # # drivers/serial/8250.c # 2004/10/26 18:52:56-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/24 22:14:58-07:00 akpm@bix.(none) # Merge bk://bk.arm.linux.org.uk/linux-2.6-serial # into bix.(none):/usr/src/bk-serial # # include/linux/8250.h # 2004/10/24 22:14:55-07:00 akpm@bix.(none) +0 -0 # Auto merged # # include/linux/8250.h # 2004/10/24 22:14:55-07:00 akpm@bix.(none) +0 -0 # Merge rename: drivers/serial/8250.h -> include/linux/8250.h # # drivers/serial/au1x00_uart.c # 2004/10/24 22:14:55-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/serial/8250.c # 2004/10/24 22:14:55-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/24 22:12:47-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-serial # # drivers/serial/8250_pnp.c # 2004/10/24 22:12:43-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/serial/8250_pci.c # 2004/10/24 22:12:42-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/24 15:34:10+01:00 arjan@nl.rmk.(none) # [SERIAL] Remove dead code. # # serial8250_get_irq_map is no longer used anywhere in the kernel (it # used to be used by the isapnp code but isn't anymore) so it's dead # code, below is a patch to remove this. # # drivers/serial/au1x00_uart.c # 2004/10/24 15:31:17+01:00 arjan@nl.rmk.(none) +0 -15 # [PATCH] Remove dead code. # # drivers/serial/8250.h # 2004/10/24 15:31:17+01:00 arjan@nl.rmk.(none) +0 -1 # [PATCH] Remove dead code. # # drivers/serial/8250.c # 2004/10/24 15:31:17+01:00 arjan@nl.rmk.(none) +0 -15 # [PATCH] Remove dead code. # # ChangeSet # 2004/10/21 14:25:49-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-serial # # drivers/serial/8250_pnp.c # 2004/10/21 14:25:45-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/21 00:25:11-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-serial # # drivers/serial/8250_pnp.c # 2004/10/21 00:25:06-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/serial/8250_pci.c # 2004/10/21 00:25:06-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/10/19 17:40:22-07:00 akpm@bix.(none) # Merge bk://bk.arm.linux.org.uk/linux-2.6-serial # into bix.(none):/usr/src/bk-serial # # drivers/serial/8250_pci.c # 2004/10/19 17:40:18-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/09/11 15:11:58-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-serial # # drivers/serial/8250_pci.c # 2004/09/11 15:11:52-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/08/23 14:44:29-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-serial # # drivers/serial/8250_pci.c # 2004/08/23 14:44:24-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/08/06 15:59:49-07:00 akpm@bix.(none) # Merge bk://bk.arm.linux.org.uk/linux-2.6-serial # into bix.(none):/usr/src/bk-serial # # drivers/serial/8250_pci.c # 2004/08/06 15:59:45-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/07/04 23:00:03-07:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-serial # # drivers/serial/8250_pnp.c # 2004/07/04 22:59:59-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/serial/8250_pci.c # 2004/07/04 22:59:59-07:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2004/07/01 14:28:30-07:00 akpm@bix.(none) # Merge bk://bk.arm.linux.org.uk/linux-2.6-serial # into bix.(none):/usr/src/bk-serial # # drivers/serial/8250_pnp.c # 2004/07/01 14:28:27-07:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/serial/8250_pci.c # 2004/07/01 14:28:27-07:00 akpm@bix.(none) +0 -0 # Auto merged # diff -Nru a/drivers/serial/8250.c b/drivers/serial/8250.c --- a/drivers/serial/8250.c 2004-10-26 18:55:12 -07:00 +++ b/drivers/serial/8250.c 2004-10-26 18:55:12 -07:00 @@ -2181,20 +2181,6 @@ return 0; } -/* - * This is for ISAPNP only. - */ -void serial8250_get_irq_map(unsigned int *map) -{ - int i; - - for (i = 0; i < UART_NR; i++) { - if (serial8250_ports[i].port.type != PORT_UNKNOWN && - serial8250_ports[i].port.irq < 16) - *map |= 1 << serial8250_ports[i].port.irq; - } -} - /** * serial8250_suspend_port - suspend one serial port * @line: serial line number @@ -2429,7 +2415,6 @@ module_init(serial8250_init); module_exit(serial8250_exit); -EXPORT_SYMBOL(serial8250_get_irq_map); EXPORT_SYMBOL(serial8250_suspend_port); EXPORT_SYMBOL(serial8250_resume_port); diff -Nru a/drivers/serial/au1x00_uart.c b/drivers/serial/au1x00_uart.c --- a/drivers/serial/au1x00_uart.c 2004-10-26 18:55:12 -07:00 +++ b/drivers/serial/au1x00_uart.c 2004-10-26 18:55:12 -07:00 @@ -1313,20 +1313,6 @@ uart_unregister_port(&serial8250_reg, line); } -/* - * This is for ISAPNP only. - */ -void serial8250_get_irq_map(unsigned int *map) -{ - int i; - - for (i = 0; i < UART_NR; i++) { - if (serial8250_ports[i].port.type != PORT_UNKNOWN && - serial8250_ports[i].port.irq < 16) - *map |= 1 << serial8250_ports[i].port.irq; - } -} - /** * serial8250_suspend_port - suspend one serial port * @line: serial line number @@ -1382,7 +1368,6 @@ EXPORT_SYMBOL(register_serial); EXPORT_SYMBOL(unregister_serial); -EXPORT_SYMBOL(serial8250_get_irq_map); EXPORT_SYMBOL(serial8250_suspend_port); EXPORT_SYMBOL(serial8250_resume_port); diff -Nru a/include/linux/8250.h b/include/linux/8250.h --- a/include/linux/8250.h 2004-10-26 18:55:12 -07:00 +++ b/include/linux/8250.h 2004-10-26 18:55:12 -07:00 @@ -19,7 +19,6 @@ int serial8250_register_port(struct uart_port *); void serial8250_unregister_port(int line); -void serial8250_get_irq_map(unsigned int *map); void serial8250_suspend_port(int line); void serial8250_resume_port(int line);