From 79f4adeeefde6b1c151339a669357d6760aba778 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rddunlap@osdl.org>
Date: Fri, 3 Oct 2003 08:32:13 -0700
Subject: [PATCH] [PATCH] janitor: cleanup includes (drivers/char)

From: Randy Hron <rwhron@earthlink.net>

Cleanup of version.h in drivers/char plus a few in include/linux
that are used in drivers/char.

Duplicate #includes removed.
---
 drivers/char/amiserial.c                        | 1 -
 drivers/char/cyclades.c                         | 1 -
 drivers/char/dsp56k.c                           | 1 -
 drivers/char/dtlk.c                             | 1 -
 drivers/char/dz.c                               | 1 -
 drivers/char/ftape/compressor/zftape-compress.c | 1 +
 drivers/char/ftape/lowlevel/fdc-io.c            | 1 -
 drivers/char/i8k.c                              | 1 -
 drivers/char/ip2/i2os.h                         | 1 -
 drivers/char/ip2main.c                          | 2 --
 drivers/char/isicom.c                           | 1 -
 drivers/char/istallion.c                        | 1 -
 drivers/char/lp_old98.c                         | 1 -
 drivers/char/moxa.c                             | 1 -
 drivers/char/mxser.c                            | 1 -
 drivers/char/pcmcia/synclink_cs.c               | 1 -
 drivers/char/pcxx.c                             | 1 -
 drivers/char/rio/rio_linux.c                    | 1 -
 drivers/char/rocket.c                           | 2 --
 drivers/char/serial167.c                        | 1 -
 drivers/char/stallion.c                         | 1 -
 drivers/char/sx.c                               | 1 -
 drivers/char/toshiba.c                          | 1 -
 drivers/char/vme_scc.c                          | 1 -
 drivers/char/watchdog/amd7xx_tco.c              | 2 --
 include/linux/ftape.h                           | 1 -
 include/linux/istallion.h                       | 2 ++
 include/linux/serialP.h                         | 1 +
 include/linux/stallion.h                        | 2 ++
 29 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 1f7854968967e..bc506dbff1422 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -32,7 +32,6 @@
  */
 
 #include <linux/config.h>
-#include <linux/version.h>
 
 #undef SERIAL_PARANOIA_CHECK
 #define SERIAL_DO_RESTART
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 401e040ed0b01..c23803cc47149 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -670,7 +670,6 @@ static char rcsid[] =
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
-#include <linux/version.h>
 
 #include <linux/stat.h>
 #include <linux/proc_fs.h>
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index cfd6527bc5146..40e67cfe20668 100644
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -24,7 +24,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/slab.h>	/* for kmalloc() and kfree() */
 #include <linux/sched.h>	/* for struct wait_queue etc */
 #include <linux/major.h>
diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index 748c8a17295ab..8febd413fd589 100644
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -48,7 +48,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 
 #define KERNEL
 #include <linux/types.h>
diff --git a/drivers/char/dz.c b/drivers/char/dz.c
index fb9eab99bf20e..2d9328e24e806 100644
--- a/drivers/char/dz.c
+++ b/drivers/char/dz.c
@@ -23,7 +23,6 @@ Qua Jun 27 15:02:26 BRT 2001
 
 /* #define DEBUG_DZ 1 */
 
-#include <linux/version.h>
 #include <linux/module.h>
 
 #include <linux/config.h>
diff --git a/drivers/char/ftape/compressor/zftape-compress.c b/drivers/char/ftape/compressor/zftape-compress.c
index 37c8fbaf247b7..d27eb620d1aff 100644
--- a/drivers/char/ftape/compressor/zftape-compress.c
+++ b/drivers/char/ftape/compressor/zftape-compress.c
@@ -31,6 +31,7 @@
  char zftc_rev[] = "$Revision: 1.1.6.1 $";
  char zftc_dat[] = "$Date: 1997/11/16 15:15:56 $";
 
+#include <linux/version.h>
 #include <linux/errno.h>
 #include <linux/mm.h>
 #include <linux/module.h>
diff --git a/drivers/char/ftape/lowlevel/fdc-io.c b/drivers/char/ftape/lowlevel/fdc-io.c
index 869192f67504b..a41a8e31917e8 100644
--- a/drivers/char/ftape/lowlevel/fdc-io.c
+++ b/drivers/char/ftape/lowlevel/fdc-io.c
@@ -30,7 +30,6 @@
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/ioport.h>
-#include <linux/version.h>
 #include <linux/interrupt.h>
 #include <asm/system.h>
 #include <asm/io.h>
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index e35a7a2453ace..577950510521c 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -17,7 +17,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
diff --git a/drivers/char/ip2/i2os.h b/drivers/char/ip2/i2os.h
index 92d0d63d755d5..eff9b542d699d 100644
--- a/drivers/char/ip2/i2os.h
+++ b/drivers/char/ip2/i2os.h
@@ -25,7 +25,6 @@
 
 #include "ip2types.h"
 #include <asm/io.h>  /* For inb, etc */
-#include <linux/version.h>
 
 //------------------------------------
 // Defines for I/O instructions:
diff --git a/drivers/char/ip2main.c b/drivers/char/ip2main.c
index eef32735a70dc..9008a4bfe72f4 100644
--- a/drivers/char/ip2main.c
+++ b/drivers/char/ip2main.c
@@ -84,8 +84,6 @@
 /************/
 #include <linux/config.h>
 
-#include <linux/version.h>
-
 #include <linux/ctype.h>
 #include <linux/string.h>
 #include <linux/fcntl.h>
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c
index 3b86716b0b308..e26a3aa12af7c 100644
--- a/drivers/char/isicom.c
+++ b/drivers/char/isicom.c
@@ -38,7 +38,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/tty.h>
 #include <linux/termios.h>
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index f26a6e1dd76e9..c43a152bc4694 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -35,7 +35,6 @@
 #include <linux/serial.h>
 #include <linux/cdk.h>
 #include <linux/comstats.h>
-#include <linux/version.h>
 #include <linux/istallion.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
diff --git a/drivers/char/lp_old98.c b/drivers/char/lp_old98.c
index 87695ee2ec078..895ca1daf71fd 100644
--- a/drivers/char/lp_old98.c
+++ b/drivers/char/lp_old98.c
@@ -23,7 +23,6 @@
 #include <linux/fcntl.h>
 #include <linux/delay.h>
 #include <linux/console.h>
-#include <linux/version.h>
 #include <linux/fs.h>
 
 #include <asm/io.h>
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 9d06508378076..3511769715d20 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -32,7 +32,6 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/version.h>
 #include <linux/mm.h>
 #include <linux/ioport.h>
 #include <linux/errno.h>
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 360df346a5595..bdbcffc7c7d3d 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -39,7 +39,6 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/errno.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index e06e10ed4f378..890a156523005 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -37,7 +37,6 @@
 
 #include <linux/config.h>	
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/errno.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
diff --git a/drivers/char/pcxx.c b/drivers/char/pcxx.c
index 78aa18b4e81c8..3d3ad669da103 100644
--- a/drivers/char/pcxx.c
+++ b/drivers/char/pcxx.c
@@ -65,7 +65,6 @@
 #include <linux/tty_driver.h>
 #include <linux/slab.h>
 #include <linux/init.h>
-#include <linux/version.h>
 
 #ifndef MODULE
 #include <linux/ctype.h> /* We only need it for parsing the "digi="-line */
diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c
index 7454df7451737..1d75ebddeee51 100644
--- a/drivers/char/rio/rio_linux.c
+++ b/drivers/char/rio/rio_linux.c
@@ -53,7 +53,6 @@
 #include <linux/fcntl.h>
 #include <linux/major.h>
 #include <linux/delay.h>
-#include <linux/version.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/miscdevice.h>
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 50fab08d460f3..843c4b5f8bd8f 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -85,11 +85,9 @@
 #include <linux/string.h>
 #include <linux/fcntl.h>
 #include <linux/ptrace.h>
-#include <linux/major.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/wait.h>
-#include <linux/delay.h>
 #include <linux/pci.h>
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index a656925ef83fb..c0904c2bbe713 100644
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -70,7 +70,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 
-#include <linux/version.h>
 #include <asm/uaccess.h>
 #include <linux/init.h>
 
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index 12fa11de37d73..cd061d88fad46 100644
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -28,7 +28,6 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
-#include <linux/version.h> /* for linux/stallion.h */
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/tty.h>
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index 68bb9b10b3098..7ae703380821d 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -240,7 +240,6 @@
 #include "sxwindow.h"
 
 #include <linux/generic_serial.h>
-#include <asm/uaccess.h>
 #include "sx.h"
 
 
diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c
index 7a1f939da5bbb..ec21a16ac052f 100644
--- a/drivers/char/toshiba.c
+++ b/drivers/char/toshiba.c
@@ -57,7 +57,6 @@
 #define TOSH_DEBUG 0
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/types.h>
diff --git a/drivers/char/vme_scc.c b/drivers/char/vme_scc.c
index 2c84b2314ffbf..6f78334173cbe 100644
--- a/drivers/char/vme_scc.c
+++ b/drivers/char/vme_scc.c
@@ -29,7 +29,6 @@
 #include <linux/fcntl.h>
 #include <linux/major.h>
 #include <linux/delay.h>
-#include <linux/version.h>
 #include <linux/slab.h>
 #include <linux/miscdevice.h>
 #include <linux/console.h>
diff --git a/drivers/char/watchdog/amd7xx_tco.c b/drivers/char/watchdog/amd7xx_tco.c
index 5418e6134d9cb..78240eeaa784e 100644
--- a/drivers/char/watchdog/amd7xx_tco.c
+++ b/drivers/char/watchdog/amd7xx_tco.c
@@ -19,13 +19,11 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/ioport.h>
 #include <linux/spinlock.h>
-#include <linux/ioport.h>
 #include <asm/semaphore.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
diff --git a/include/linux/ftape.h b/include/linux/ftape.h
index e21d4b4428432..5774b1bfc0457 100644
--- a/include/linux/ftape.h
+++ b/include/linux/ftape.h
@@ -35,7 +35,6 @@
 #include <linux/mm.h>
 #endif
 #include <linux/types.h>
-#include <linux/version.h>
 #include <linux/config.h>
 #include <linux/mtio.h>
 
diff --git a/include/linux/istallion.h b/include/linux/istallion.h
index 0376ed672c0b7..8e72597f2b741 100644
--- a/include/linux/istallion.h
+++ b/include/linux/istallion.h
@@ -21,6 +21,8 @@
  *	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <linux/version.h>
+
 /*****************************************************************************/
 #ifndef	_ISTALLION_H
 #define	_ISTALLION_H
diff --git a/include/linux/serialP.h b/include/linux/serialP.h
index b4a17afde7df7..6b92d29979cac 100644
--- a/include/linux/serialP.h
+++ b/include/linux/serialP.h
@@ -19,6 +19,7 @@
  * For definitions of the flags field, see tty.h
  */
 
+#include <linux/version.h>
 #include <linux/config.h>
 #include <linux/termios.h>
 #include <linux/workqueue.h>
diff --git a/include/linux/stallion.h b/include/linux/stallion.h
index bb0d71b263d1b..228180adb5ecf 100644
--- a/include/linux/stallion.h
+++ b/include/linux/stallion.h
@@ -21,6 +21,8 @@
  *	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <linux/version.h>
+
 /*****************************************************************************/
 #ifndef	_STALLION_H
 #define	_STALLION_H
-- 
2.53.0