Skip to content

L
linux
Commit 29363ba0 authored by Russell King's avatar Russell King
Browse files
Options

[SERIAL] Cleanup includes. 

Al Viro pointed out there was a fair bit of redundancy here.  We
remove many include files from the serial layer, leaving those
which are necessary for it to build.  This has been posted to lkml,
no one complained.

This cset also combines a missing include of asm/io.h in 8250_pci.c
(unfortunately I've lost the name of the reporter, sorry.)
parent 81059697
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 135 deletions
drivers/serial/21285.c
View file @ 29363ba0
...@@ -5,29 +5,19 @@ ...@@ -5,29 +5,19 @@
* *
* Based on drivers/char/serial.c * Based on drivers/char/serial.c
* *
* $Id: 21285.c,v 1.34 2002/07/22 15:27:32 rmk Exp $ * $Id: 21285.c,v 1.37 2002/07/28 10:03:27 rmk Exp $
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/errno.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/serial.h>
#include <linux/major.h>
#include <linux/ptrace.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <linux/serial.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/uaccess.h>
#include <asm/hardware/dec21285.h> #include <asm/hardware/dec21285.h>
#include <asm/hardware.h> #include <asm/hardware.h>
...@@ -510,7 +500,7 @@ static int __init serial21285_init(void) ...@@ -510,7 +500,7 @@ static int __init serial21285_init(void)
{ {
int ret; int ret;
printk(KERN_INFO "Serial: 21285 driver $Revision: 1.34 $\n"); printk(KERN_INFO "Serial: 21285 driver $Revision: 1.37 $\n");
serial21285_setup_ports(); serial21285_setup_ports();
...@@ -533,4 +523,4 @@ module_exit(serial21285_exit); ...@@ -533,4 +523,4 @@ module_exit(serial21285_exit);
EXPORT_NO_SYMBOLS; EXPORT_NO_SYMBOLS;
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Intel Footbridge (21285) serial driver $Revision: 1.34 $"); MODULE_DESCRIPTION("Intel Footbridge (21285) serial driver $Revision: 1.37 $");
drivers/serial/8250.c
View file @ 29363ba0
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* $Id: 8250.c,v 1.84 2002/07/22 15:27:32 rmk Exp $ * $Id: 8250.c,v 1.90 2002/07/28 10:03:27 rmk Exp $
* *
* A note about mapbase / membase * A note about mapbase / membase
* *
...@@ -25,29 +25,17 @@ ...@@ -25,29 +25,17 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/compiler.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/major.h>
#include <linux/slab.h>
#include <linux/ptrace.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/serial.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/sysrq.h> #include <linux/sysrq.h>
#include <linux/serial_reg.h> #include <linux/serial_reg.h>
#include <linux/serialP.h> #include <linux/serialP.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/kmod.h>
#include <asm/system.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/uaccess.h>
#include <asm/bitops.h>
#if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) #if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
#define SUPPORT_SYSRQ #define SUPPORT_SYSRQ
...@@ -1951,7 +1939,7 @@ static int __init serial8250_init(void) ...@@ -1951,7 +1939,7 @@ static int __init serial8250_init(void)
{ {
int ret, i; int ret, i;
printk(KERN_INFO "Serial: 8250/16550 driver $Revision: 1.84 $ " printk(KERN_INFO "Serial: 8250/16550 driver $Revision: 1.90 $ "
"IRQ sharing %sabled\n", share_irqs ? "en" : "dis"); "IRQ sharing %sabled\n", share_irqs ? "en" : "dis");
for (i = 0; i < NR_IRQS; i++) for (i = 0; i < NR_IRQS; i++)
...@@ -1983,7 +1971,7 @@ EXPORT_SYMBOL(unregister_serial); ...@@ -1983,7 +1971,7 @@ EXPORT_SYMBOL(unregister_serial);
EXPORT_SYMBOL(serial8250_get_irq_map); EXPORT_SYMBOL(serial8250_get_irq_map);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Generic 8250/16x50 serial driver $Revision: 1.84 $"); MODULE_DESCRIPTION("Generic 8250/16x50 serial driver $Revision: 1.90 $");
MODULE_PARM(share_irqs, "i"); MODULE_PARM(share_irqs, "i");
MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices" MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices"
......
drivers/serial/8250_pci.c
View file @ 29363ba0
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License. * the Free Software Foundation; either version 2 of the License.
* *
* $Id: 8250_pci.c,v 1.19 2002/07/21 21:32:30 rmk Exp $ * $Id: 8250_pci.c,v 1.24 2002/07/29 14:39:56 rmk Exp $
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <asm/bitops.h> #include <asm/bitops.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/serial.h> #include <asm/serial.h>
#include <asm/io.h>
#include "8250.h" #include "8250.h"
......
drivers/serial/amba.c
View file @ 29363ba0
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: amba.c,v 1.37 2002/07/22 15:27:32 rmk Exp $ * $Id: amba.c,v 1.41 2002/07/28 10:03:27 rmk Exp $
* *
* This is a generic driver for ARM AMBA-type serial ports. They * This is a generic driver for ARM AMBA-type serial ports. They
* have a lot of 16550-like features, but are not register compatable. * have a lot of 16550-like features, but are not register compatable.
...@@ -33,30 +33,15 @@ ...@@ -33,30 +33,15 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/errno.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/major.h>
#include <linux/string.h>
#include <linux/fcntl.h>
#include <linux/ptrace.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/circ_buf.h>
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/sysrq.h> #include <linux/sysrq.h>
#include <asm/system.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/uaccess.h>
#include <asm/bitops.h>
#if defined(CONFIG_SERIAL_AMBA_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) #if defined(CONFIG_SERIAL_AMBA_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
#define SUPPORT_SYSRQ #define SUPPORT_SYSRQ
...@@ -736,7 +721,7 @@ static int __init ambauart_init(void) ...@@ -736,7 +721,7 @@ static int __init ambauart_init(void)
{ {
int ret; int ret;
printk(KERN_INFO "Serial: AMBA driver $Revision: 1.37 $\n"); printk(KERN_INFO "Serial: AMBA driver $Revision: 1.41 $\n");
ret = uart_register_driver(&amba_reg); ret = uart_register_driver(&amba_reg);
if (ret == 0) { if (ret == 0) {
...@@ -764,5 +749,5 @@ module_exit(ambauart_exit); ...@@ -764,5 +749,5 @@ module_exit(ambauart_exit);
EXPORT_NO_SYMBOLS; EXPORT_NO_SYMBOLS;
MODULE_AUTHOR("ARM Ltd/Deep Blue Solutions Ltd"); MODULE_AUTHOR("ARM Ltd/Deep Blue Solutions Ltd");
MODULE_DESCRIPTION("ARM AMBA serial port driver $Revision: 1.37 $"); MODULE_DESCRIPTION("ARM AMBA serial port driver $Revision: 1.41 $");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
drivers/serial/anakin.c
View file @ 29363ba0
...@@ -19,35 +19,20 @@ ...@@ -19,35 +19,20 @@
* SA_INTERRUPT. Works reliably now. No longer requires * SA_INTERRUPT. Works reliably now. No longer requires
* changes to the serial_core API. * changes to the serial_core API.
* *
* $Id: anakin.c,v 1.29 2002/07/22 15:27:32 rmk Exp $ * $Id: anakin.c,v 1.32 2002/07/28 10:03:27 rmk Exp $
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/errno.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/major.h>
#include <linux/string.h>
#include <linux/fcntl.h>
#include <linux/ptrace.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/circ_buf.h>
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/sysrq.h> #include <linux/sysrq.h>
#include <asm/system.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/uaccess.h>
#include <asm/bitops.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
...@@ -514,7 +499,7 @@ anakin_init(void) ...@@ -514,7 +499,7 @@ anakin_init(void)
{ {
int ret; int ret;
printk(KERN_INFO "Serial: Anakin driver $Revision: 1.29 $\n"); printk(KERN_INFO "Serial: Anakin driver $Revision: 1.32 $\n");
ret = uart_register_driver(&anakin_reg); ret = uart_register_driver(&anakin_reg);
if (ret == 0) { if (ret == 0) {
......
drivers/serial/clps711x.c
View file @ 29363ba0
...@@ -22,37 +22,22 @@ ...@@ -22,37 +22,22 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: clps711x.c,v 1.40 2002/07/22 15:27:32 rmk Exp $ * $Id: clps711x.c,v 1.42 2002/07/28 10:03:28 rmk Exp $
* *
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/errno.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/major.h>
#include <linux/string.h>
#include <linux/fcntl.h>
#include <linux/ptrace.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/circ_buf.h>
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/sysrq.h> #include <linux/sysrq.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <asm/bitops.h>
#include <asm/hardware.h> #include <asm/hardware.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#if defined(CONFIG_SERIAL_CLPS711X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) #if defined(CONFIG_SERIAL_CLPS711X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
#define SUPPORT_SYSRQ #define SUPPORT_SYSRQ
...@@ -597,7 +582,7 @@ static int __init clps711xuart_init(void) ...@@ -597,7 +582,7 @@ static int __init clps711xuart_init(void)
{ {
int ret, i; int ret, i;
printk(KERN_INFO "Serial: CLPS711x driver $Revision: 1.40 $\n"); printk(KERN_INFO "Serial: CLPS711x driver $Revision: 1.42 $\n");
ret = uart_register_driver(&clps711x_reg); ret = uart_register_driver(&clps711x_reg);
if (ret) if (ret)
...@@ -625,5 +610,5 @@ module_exit(clps711xuart_exit); ...@@ -625,5 +610,5 @@ module_exit(clps711xuart_exit);
EXPORT_NO_SYMBOLS; EXPORT_NO_SYMBOLS;
MODULE_AUTHOR("Deep Blue Solutions Ltd"); MODULE_AUTHOR("Deep Blue Solutions Ltd");
MODULE_DESCRIPTION("CLPS-711x generic serial driver $Revision: 1.40 $"); MODULE_DESCRIPTION("CLPS-711x generic serial driver $Revision: 1.42 $");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
drivers/serial/core.c
View file @ 29363ba0
...@@ -22,38 +22,22 @@ ...@@ -22,38 +22,22 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: core.c,v 1.91 2002/07/22 15:27:32 rmk Exp $ * $Id: core.c,v 1.100 2002/07/28 10:03:28 rmk Exp $
* *
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/errno.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/major.h>
#include <linux/string.h>
#include <linux/fcntl.h>
#include <linux/ptrace.h>
#include <linux/ioport.h>
#include <linux/mm.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/circ_buf.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/sysrq.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/serial.h> /* for serial_state and serial_icounter_struct */ #include <linux/serial.h> /* for serial_state and serial_icounter_struct */
#include <asm/system.h>
#include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/bitops.h>
#undef DEBUG #undef DEBUG
#ifdef DEBUG #ifdef DEBUG
......
drivers/serial/sa1100.c
View file @ 29363ba0
...@@ -21,35 +21,20 @@ ...@@ -21,35 +21,20 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: sa1100.c,v 1.43 2002/07/22 15:27:32 rmk Exp $ * $Id: sa1100.c,v 1.50 2002/07/29 14:41:04 rmk Exp $
* *
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/errno.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/major.h>
#include <linux/string.h>
#include <linux/fcntl.h>
#include <linux/ptrace.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/circ_buf.h>
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/sysrq.h> #include <linux/sysrq.h>
#include <asm/system.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/uaccess.h>
#include <asm/bitops.h>
#include <asm/hardware.h> #include <asm/hardware.h>
#include <asm/mach/serial_sa1100.h> #include <asm/mach/serial_sa1100.h>
...@@ -857,7 +842,7 @@ static int __init sa1100_serial_init(void) ...@@ -857,7 +842,7 @@ static int __init sa1100_serial_init(void)
{ {
int ret; int ret;
printk(KERN_INFO "Serial: SA11x0 driver $Revision: 1.43 $\n"); printk(KERN_INFO "Serial: SA11x0 driver $Revision: 1.50 $\n");
sa1100_init_ports(); sa1100_init_ports();
ret = uart_register_driver(&sa1100_reg); ret = uart_register_driver(&sa1100_reg);
...@@ -886,5 +871,5 @@ module_exit(sa1100_serial_exit); ...@@ -886,5 +871,5 @@ module_exit(sa1100_serial_exit);
EXPORT_NO_SYMBOLS; EXPORT_NO_SYMBOLS;
MODULE_AUTHOR("Deep Blue Solutions Ltd"); MODULE_AUTHOR("Deep Blue Solutions Ltd");
MODULE_DESCRIPTION("SA1100 generic serial port driver $Revision: 1.43 $"); MODULE_DESCRIPTION("SA1100 generic serial port driver $Revision: 1.50 $");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
drivers/serial/uart00.c
View file @ 29363ba0
...@@ -21,36 +21,21 @@ ...@@ -21,36 +21,21 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Id: uart00.c,v 1.33 2002/07/21 21:32:31 rmk Exp $ * $Id: uart00.c,v 1.35 2002/07/28 10:03:28 rmk Exp $
* *
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/errno.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/tty_flip.h>
#include <linux/major.h>
#include <linux/string.h>
#include <linux/fcntl.h>
#include <linux/ptrace.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/circ_buf.h>
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/sysrq.h> #include <linux/sysrq.h>
#include <linux/pld/pld_hotswap.h> #include <linux/pld/pld_hotswap.h>
#include <asm/system.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/uaccess.h>
#include <asm/bitops.h>
#include <asm/sizes.h> #include <asm/sizes.h>
#if defined(CONFIG_SERIAL_UART00_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) #if defined(CONFIG_SERIAL_UART00_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
...@@ -755,7 +740,7 @@ static int __init uart00_init(void) ...@@ -755,7 +740,7 @@ static int __init uart00_init(void)
{ {
int result; int result;
printk(KERN_INFO "Serial: UART00 driver $Revision: 1.33 $\n"); printk(KERN_INFO "Serial: UART00 driver $Revision: 1.35 $\n");
printk(KERN_WARNING "serial_uart00:Using temporary major/minor pairs" printk(KERN_WARNING "serial_uart00:Using temporary major/minor pairs"
" - these WILL change in the future\n"); " - these WILL change in the future\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7