tty: move obsolete and broken generic_serial drivers to drivers/stagi…

…ng/generic_serial/ As planned by Arnd Bergmann, this moves the following drivers to the drivers/staging/generic_serial directory where they will be removed after 2.6.41 if no one steps up to claim them. generic_serial rio ser_a2232 sx vme_scc Cc: Arnd Bergmann <arnd@arndb.de> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
git-mirror · Feb 23, 2011 · 4c37705 · 4c37705
1 parent 4a6514e
commit 4c37705
Show file tree

Hide file tree

Showing 56 changed files with 60 additions and 50 deletions.
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
@@ -15,34 +15,6 @@ config DEVKMEM
 	  kind of kernel debugging operations.
 	  When in doubt, say "N".
 
-config SX
-	tristate "Specialix SX (and SI) card support"
-	depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) && BROKEN
-	help
-	  This is a driver for the SX and SI multiport serial cards.
-	  Please read the file <file:Documentation/serial/sx.txt> for details.
-
-	  This driver can only be built as a module ( = code which can be
-	  inserted in and removed from the running kernel whenever you want).
-	  The module will be called sx. If you want to do that, say M here.
-
-config RIO
-	tristate "Specialix RIO system support"
-	depends on SERIAL_NONSTANDARD && BROKEN
-	help
-	  This is a driver for the Specialix RIO, a smart serial card which
-	  drives an outboard box that can support up to 128 ports.  Product
-	  information is at <http://www.perle.com/support/documentation.html#multiport>.
-	  There are both ISA and PCI versions.
-
-config RIO_OLDPCI
-	bool "Support really old RIO/PCI cards"
-	depends on RIO
-	help
-	  Older RIO PCI cards need some initialization-time configuration to
-	  determine the IRQ and some control addresses.  If you have a RIO and
-	  this doesn't seem to work, try setting this to Y.
-
 config STALDRV
 	bool "Stallion multiport serial support"
 	depends on SERIAL_NONSTANDARD
@@ -55,22 +27,6 @@ config STALDRV
 	  in this case.  If you have never heard about all this, it's safe to
 	  say N.
 
-config A2232
-	tristate "Commodore A2232 serial support (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && ZORRO && BROKEN
-	---help---
-	  This option supports the 2232 7-port serial card shipped with the
-	  Amiga 2000 and other Zorro-bus machines, dating from 1989.  At
-	  a max of 19,200 bps, the ports are served by a 6551 ACIA UART chip
-	  each, plus a 8520 CIA, and a master 6502 CPU and buffer as well. The
-	  ports were connected with 8 pin DIN connectors on the card bracket,
-	  for which 8 pin to DB25 adapters were supplied. The card also had
-	  jumpers internally to toggle various pinning configurations.
-
-	  This driver can be built as a module; but then "generic_serial"
-	  will also be built as a module. This has to be loaded before
-	  "ser_a2232". If you want to do this, answer M here.
-
 config SGI_SNSC
 	bool "SGI Altix system controller communication support"
 	depends on (IA64_SGI_SN2 || IA64_GENERIC)

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
@@ -5,13 +5,7 @@
 obj-y				+= mem.o random.o
 obj-$(CONFIG_TTY_PRINTK)	+= ttyprintk.o
 obj-y				+= misc.o
-obj-$(CONFIG_MVME147_SCC)	+= generic_serial.o vme_scc.o
-obj-$(CONFIG_MVME162_SCC)	+= generic_serial.o vme_scc.o
-obj-$(CONFIG_BVME6000_SCC)	+= generic_serial.o vme_scc.o
-obj-$(CONFIG_A2232)		+= ser_a2232.o generic_serial.o
 obj-$(CONFIG_ATARI_DSP56K)	+= dsp56k.o
-obj-$(CONFIG_SX)		+= sx.o generic_serial.o
-obj-$(CONFIG_RIO)		+= rio/ generic_serial.o
 obj-$(CONFIG_RAW_DRIVER)	+= raw.o
 obj-$(CONFIG_SGI_SNSC)		+= snsc.o snsc_event.o
 obj-$(CONFIG_MSPEC)		+= mspec.o

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
@@ -43,6 +43,8 @@ if !STAGING_EXCLUDE_BUILD
 
 source "drivers/staging/tty/Kconfig"
 
+source "drivers/staging/generic_serial/Kconfig"
+
 source "drivers/staging/et131x/Kconfig"
 
 source "drivers/staging/slicoss/Kconfig"

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
@@ -4,6 +4,7 @@
 obj-$(CONFIG_STAGING)		+= staging.o
 
 obj-y += tty/
+obj-y += generic_serial/
 obj-$(CONFIG_ET131X)		+= et131x/
 obj-$(CONFIG_SLICOSS)		+= slicoss/
 obj-$(CONFIG_VIDEO_GO7007)	+= go7007/

diff --git a/drivers/staging/generic_serial/Kconfig b/drivers/staging/generic_serial/Kconfig
@@ -0,0 +1,45 @@
+config A2232
+	tristate "Commodore A2232 serial support (EXPERIMENTAL)"
+	depends on EXPERIMENTAL && ZORRO && BROKEN
+	---help---
+	  This option supports the 2232 7-port serial card shipped with the
+	  Amiga 2000 and other Zorro-bus machines, dating from 1989.  At
+	  a max of 19,200 bps, the ports are served by a 6551 ACIA UART chip
+	  each, plus a 8520 CIA, and a master 6502 CPU and buffer as well. The
+	  ports were connected with 8 pin DIN connectors on the card bracket,
+	  for which 8 pin to DB25 adapters were supplied. The card also had
+	  jumpers internally to toggle various pinning configurations.
+
+	  This driver can be built as a module; but then "generic_serial"
+	  will also be built as a module. This has to be loaded before
+	  "ser_a2232". If you want to do this, answer M here.
+
+config SX
+	tristate "Specialix SX (and SI) card support"
+	depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) && BROKEN
+	help
+	  This is a driver for the SX and SI multiport serial cards.
+	  Please read the file <file:Documentation/serial/sx.txt> for details.
+
+	  This driver can only be built as a module ( = code which can be
+	  inserted in and removed from the running kernel whenever you want).
+	  The module will be called sx. If you want to do that, say M here.
+
+config RIO
+	tristate "Specialix RIO system support"
+	depends on SERIAL_NONSTANDARD && BROKEN
+	help
+	  This is a driver for the Specialix RIO, a smart serial card which
+	  drives an outboard box that can support up to 128 ports.  Product
+	  information is at <http://www.perle.com/support/documentation.html#multiport>.
+	  There are both ISA and PCI versions.
+
+config RIO_OLDPCI
+	bool "Support really old RIO/PCI cards"
+	depends on RIO
+	help
+	  Older RIO PCI cards need some initialization-time configuration to
+	  determine the IRQ and some control addresses.  If you have a RIO and
+	  this doesn't seem to work, try setting this to Y.
+
+
diff --git a/drivers/staging/generic_serial/Makefile b/drivers/staging/generic_serial/Makefile
@@ -0,0 +1,6 @@
+obj-$(CONFIG_MVME147_SCC)	+= generic_serial.o vme_scc.o
+obj-$(CONFIG_MVME162_SCC)	+= generic_serial.o vme_scc.o
+obj-$(CONFIG_BVME6000_SCC)	+= generic_serial.o vme_scc.o
+obj-$(CONFIG_A2232)		+= ser_a2232.o generic_serial.o
+obj-$(CONFIG_SX)		+= sx.o generic_serial.o
+obj-$(CONFIG_RIO)		+= rio/ generic_serial.o
diff --git a/drivers/staging/generic_serial/TODO b/drivers/staging/generic_serial/TODO
@@ -0,0 +1,6 @@
+These are a few tty/serial drivers that either do not build,
+or work if they do build, or if they seem to work, are for obsolete
+hardware, or are full of unfixable races and no one uses them anymore.
+
+If no one steps up to adopt any of these drivers, they will be removed
+in the 2.6.41 release.
diff --git a/drivers/char/generic_serial.c → ...s/staging/generic_serial/generic_serial.c b/drivers/char/generic_serial.c → ...s/staging/generic_serial/generic_serial.c
diff --git a/drivers/char/rio/Makefile → drivers/staging/generic_serial/rio/Makefile b/drivers/char/rio/Makefile → drivers/staging/generic_serial/rio/Makefile
diff --git a/drivers/char/rio/board.h → drivers/staging/generic_serial/rio/board.h b/drivers/char/rio/board.h → drivers/staging/generic_serial/rio/board.h
diff --git a/drivers/char/rio/cirrus.h → drivers/staging/generic_serial/rio/cirrus.h b/drivers/char/rio/cirrus.h → drivers/staging/generic_serial/rio/cirrus.h
diff --git a/drivers/char/rio/cmdblk.h → drivers/staging/generic_serial/rio/cmdblk.h b/drivers/char/rio/cmdblk.h → drivers/staging/generic_serial/rio/cmdblk.h
diff --git a/drivers/char/rio/cmdpkt.h → drivers/staging/generic_serial/rio/cmdpkt.h b/drivers/char/rio/cmdpkt.h → drivers/staging/generic_serial/rio/cmdpkt.h
diff --git a/drivers/char/rio/daemon.h → drivers/staging/generic_serial/rio/daemon.h b/drivers/char/rio/daemon.h → drivers/staging/generic_serial/rio/daemon.h
diff --git a/drivers/char/rio/errors.h → drivers/staging/generic_serial/rio/errors.h b/drivers/char/rio/errors.h → drivers/staging/generic_serial/rio/errors.h
diff --git a/drivers/char/rio/func.h → drivers/staging/generic_serial/rio/func.h b/drivers/char/rio/func.h → drivers/staging/generic_serial/rio/func.h
diff --git a/drivers/char/rio/host.h → drivers/staging/generic_serial/rio/host.h b/drivers/char/rio/host.h → drivers/staging/generic_serial/rio/host.h
diff --git a/drivers/char/rio/link.h → drivers/staging/generic_serial/rio/link.h b/drivers/char/rio/link.h → drivers/staging/generic_serial/rio/link.h
diff --git a/drivers/char/rio/linux_compat.h → ...staging/generic_serial/rio/linux_compat.h b/drivers/char/rio/linux_compat.h → ...staging/generic_serial/rio/linux_compat.h
diff --git a/drivers/char/rio/map.h → drivers/staging/generic_serial/rio/map.h b/drivers/char/rio/map.h → drivers/staging/generic_serial/rio/map.h
diff --git a/drivers/char/rio/param.h → drivers/staging/generic_serial/rio/param.h b/drivers/char/rio/param.h → drivers/staging/generic_serial/rio/param.h
diff --git a/drivers/char/rio/parmmap.h → drivers/staging/generic_serial/rio/parmmap.h b/drivers/char/rio/parmmap.h → drivers/staging/generic_serial/rio/parmmap.h
diff --git a/drivers/char/rio/pci.h → drivers/staging/generic_serial/rio/pci.h b/drivers/char/rio/pci.h → drivers/staging/generic_serial/rio/pci.h
diff --git a/drivers/char/rio/phb.h → drivers/staging/generic_serial/rio/phb.h b/drivers/char/rio/phb.h → drivers/staging/generic_serial/rio/phb.h
diff --git a/drivers/char/rio/pkt.h → drivers/staging/generic_serial/rio/pkt.h b/drivers/char/rio/pkt.h → drivers/staging/generic_serial/rio/pkt.h
diff --git a/drivers/char/rio/port.h → drivers/staging/generic_serial/rio/port.h b/drivers/char/rio/port.h → drivers/staging/generic_serial/rio/port.h
diff --git a/drivers/char/rio/protsts.h → drivers/staging/generic_serial/rio/protsts.h b/drivers/char/rio/protsts.h → drivers/staging/generic_serial/rio/protsts.h
diff --git a/drivers/char/rio/rio.h → drivers/staging/generic_serial/rio/rio.h b/drivers/char/rio/rio.h → drivers/staging/generic_serial/rio/rio.h
diff --git a/drivers/char/rio/rio_linux.c → ...rs/staging/generic_serial/rio/rio_linux.c b/drivers/char/rio/rio_linux.c → ...rs/staging/generic_serial/rio/rio_linux.c
diff --git a/drivers/char/rio/rio_linux.h → ...rs/staging/generic_serial/rio/rio_linux.h b/drivers/char/rio/rio_linux.h → ...rs/staging/generic_serial/rio/rio_linux.h
diff --git a/drivers/char/rio/rioboard.h → ...ers/staging/generic_serial/rio/rioboard.h b/drivers/char/rio/rioboard.h → ...ers/staging/generic_serial/rio/rioboard.h
diff --git a/drivers/char/rio/rioboot.c → drivers/staging/generic_serial/rio/rioboot.c b/drivers/char/rio/rioboot.c → drivers/staging/generic_serial/rio/rioboot.c
diff --git a/drivers/char/rio/riocmd.c → drivers/staging/generic_serial/rio/riocmd.c b/drivers/char/rio/riocmd.c → drivers/staging/generic_serial/rio/riocmd.c
diff --git a/drivers/char/rio/rioctrl.c → drivers/staging/generic_serial/rio/rioctrl.c b/drivers/char/rio/rioctrl.c → drivers/staging/generic_serial/rio/rioctrl.c
diff --git a/drivers/char/rio/riodrvr.h → drivers/staging/generic_serial/rio/riodrvr.h b/drivers/char/rio/riodrvr.h → drivers/staging/generic_serial/rio/riodrvr.h
diff --git a/drivers/char/rio/rioinfo.h → drivers/staging/generic_serial/rio/rioinfo.h b/drivers/char/rio/rioinfo.h → drivers/staging/generic_serial/rio/rioinfo.h
diff --git a/drivers/char/rio/rioinit.c → drivers/staging/generic_serial/rio/rioinit.c b/drivers/char/rio/rioinit.c → drivers/staging/generic_serial/rio/rioinit.c
diff --git a/drivers/char/rio/riointr.c → drivers/staging/generic_serial/rio/riointr.c b/drivers/char/rio/riointr.c → drivers/staging/generic_serial/rio/riointr.c
diff --git a/drivers/char/rio/rioioctl.h → ...ers/staging/generic_serial/rio/rioioctl.h b/drivers/char/rio/rioioctl.h → ...ers/staging/generic_serial/rio/rioioctl.h
diff --git a/drivers/char/rio/rioparam.c → ...ers/staging/generic_serial/rio/rioparam.c b/drivers/char/rio/rioparam.c → ...ers/staging/generic_serial/rio/rioparam.c
diff --git a/drivers/char/rio/rioroute.c → ...ers/staging/generic_serial/rio/rioroute.c b/drivers/char/rio/rioroute.c → ...ers/staging/generic_serial/rio/rioroute.c
diff --git a/drivers/char/rio/riospace.h → ...ers/staging/generic_serial/rio/riospace.h b/drivers/char/rio/riospace.h → ...ers/staging/generic_serial/rio/riospace.h
diff --git a/drivers/char/rio/riotable.c → ...ers/staging/generic_serial/rio/riotable.c b/drivers/char/rio/riotable.c → ...ers/staging/generic_serial/rio/riotable.c
diff --git a/drivers/char/rio/riotty.c → drivers/staging/generic_serial/rio/riotty.c b/drivers/char/rio/riotty.c → drivers/staging/generic_serial/rio/riotty.c
diff --git a/drivers/char/rio/route.h → drivers/staging/generic_serial/rio/route.h b/drivers/char/rio/route.h → drivers/staging/generic_serial/rio/route.h
diff --git a/drivers/char/rio/rup.h → drivers/staging/generic_serial/rio/rup.h b/drivers/char/rio/rup.h → drivers/staging/generic_serial/rio/rup.h
diff --git a/drivers/char/rio/unixrup.h → drivers/staging/generic_serial/rio/unixrup.h b/drivers/char/rio/unixrup.h → drivers/staging/generic_serial/rio/unixrup.h
diff --git a/drivers/char/ser_a2232.c → drivers/staging/generic_serial/ser_a2232.c b/drivers/char/ser_a2232.c → drivers/staging/generic_serial/ser_a2232.c
diff --git a/drivers/char/ser_a2232.h → drivers/staging/generic_serial/ser_a2232.h b/drivers/char/ser_a2232.h → drivers/staging/generic_serial/ser_a2232.h
diff --git a/drivers/char/ser_a2232fw.ax → ...ers/staging/generic_serial/ser_a2232fw.ax b/drivers/char/ser_a2232fw.ax → ...ers/staging/generic_serial/ser_a2232fw.ax
diff --git a/drivers/char/ser_a2232fw.h → drivers/staging/generic_serial/ser_a2232fw.h b/drivers/char/ser_a2232fw.h → drivers/staging/generic_serial/ser_a2232fw.h
diff --git a/drivers/char/sx.c → drivers/staging/generic_serial/sx.c b/drivers/char/sx.c → drivers/staging/generic_serial/sx.c
diff --git a/drivers/char/sx.h → drivers/staging/generic_serial/sx.h b/drivers/char/sx.h → drivers/staging/generic_serial/sx.h
diff --git a/drivers/char/sxboards.h → drivers/staging/generic_serial/sxboards.h b/drivers/char/sxboards.h → drivers/staging/generic_serial/sxboards.h
diff --git a/drivers/char/sxwindow.h → drivers/staging/generic_serial/sxwindow.h b/drivers/char/sxwindow.h → drivers/staging/generic_serial/sxwindow.h
diff --git a/drivers/char/vme_scc.c → drivers/staging/generic_serial/vme_scc.c b/drivers/char/vme_scc.c → drivers/staging/generic_serial/vme_scc.c