USB: serial: move the "simple" drivers into usb-serial-simple.c

Instead of having to create a new driver for a "simple" usb to serial
device, mush them all into one file, with a macro, so as to make it easy
to add new ones.

Cc: "René Bürgel" <rene.buergel@sohard.de>
Acked-by: Wei Shuai <cpuwolf@gmail.com>
Cc: Josh Triplett <josh@joshtriplett.org>
Acked-by: Frans Klaver <frans.klaver@xsens.com>
Cc: "Wesley W. Terpstra" <w.terpstra@gsi.de>
Cc: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 18 insertions, 66 deletions

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 7eef9b33fde6..c454bfa22a10 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -51,6 +51,24 @@ config USB_SERIAL_GENERIC
           support" be compiled as a module for this driver to be used
           properly.
 
+config USB_SERIAL_SIMPLE
+        tristate "USB Serial Simple Driver"
+        help
+          Say Y here to use the USB serial "simple" driver.  This driver
+          handles a wide range of very simple devices, all in one
+          driver.  Specifically, it supports:
+                - Suunto ANT+ USB device.
+                - Fundamental Software dongle.
+                - HP4x calculators
+                - a number of Motoroloa phones
+                - Siemens USB/MPI adapter.
+                - ViVOtech ViVOpay USB device.
+                - Infineon Modem Flashloader USB interface
+                - ZIO Motherboard USB serial interface
+
+          To compile this driver as a module, choose M here: the module
+          will be called usb-serial-simple.
+
 config USB_SERIAL_AIRCABLE
         tristate "USB AIRcable Bluetooth Dongle Driver"
         help
@@ -158,14 +176,6 @@ config USB_SERIAL_FTDI_SIO
           To compile this driver as a module, choose M here: the
           module will be called ftdi_sio.
 
-config USB_SERIAL_FUNSOFT
-        tristate "USB Fundamental Software Dongle Driver"
-        ---help---
-          Say Y here if you want to use the Fundamental Software dongle.
-
-          To compile this driver as a module, choose M here: the
-          module will be called funsoft.
-
 config USB_SERIAL_VISOR
         tristate "USB Handspring Visor / Palm m50x / Sony Clie Driver"
         help
@@ -462,15 +472,6 @@ config USB_SERIAL_MOS7840
           To compile this driver as a module, choose M here: the
           module will be called mos7840.  If unsure, choose N.
 
-config USB_SERIAL_MOTOROLA
-        tristate "USB Motorola Phone modem driver"
-        ---help---
-          Say Y here if you want to use a Motorola phone with a USB
-          connector as a modem link.
-
-          To compile this driver as a module, choose M here: the
-          module will be called moto_modem.  If unsure, choose N.
-
 config USB_SERIAL_NAVMAN
         tristate "USB Navman GPS device"
         help
@@ -525,14 +526,6 @@ config USB_SERIAL_SPCP8X5
           To compile this driver as a module, choose M here: the
           module will be called spcp8x5.
 
-config USB_SERIAL_HP4X
-        tristate "USB HP4x Calculators support"
-        help
-          Say Y here if you want to use an Hewlett-Packard 4x Calculator.
-
-          To compile this driver as a module, choose M here: the
-          module will be called hp4x.
-
 config USB_SERIAL_SAFE
         tristate "USB Safe Serial (Encapsulated) Driver"
 
@@ -540,14 +533,6 @@ config USB_SERIAL_SAFE_PADDED
         bool "USB Secure Encapsulated Driver - Padded"
         depends on USB_SERIAL_SAFE
 
-config USB_SERIAL_SIEMENS_MPI
-        tristate "USB Siemens MPI driver"
-        help
-          Say M here if you want to use a Siemens USB/MPI adapter.
-
-          To compile this driver as a module, choose M here: the
-          module will be called siemens_mpi.
-
 config USB_SERIAL_SIERRAWIRELESS
         tristate "USB Sierra Wireless Driver"
         help
@@ -639,14 +624,6 @@ config USB_SERIAL_OPTICON
           To compile this driver as a module, choose M here: the
           module will be called opticon.
 
-config USB_SERIAL_VIVOPAY_SERIAL
-        tristate "USB ViVOpay serial interface driver"
-        help
-          Say Y here if you want to use a ViVOtech ViVOpay USB device.
-
-          To compile this driver as a module, choose M here: the
-          module will be called vivopay-serial.
-
 config USB_SERIAL_XSENS_MT
         tristate "Xsens motion tracker serial interface driver"
         help
@@ -659,14 +636,6 @@ config USB_SERIAL_XSENS_MT
           To compile this driver as a module, choose M here: the
           module will be called xsens_mt.
 
-config USB_SERIAL_ZIO
-        tristate "ZIO Motherboard USB serial interface driver"
-        help
-          Say Y here if you want to use ZIO Motherboard.
-
-          To compile this driver as a module, choose M here: the
-          module will be called zio.
-
 config USB_SERIAL_WISHBONE
         tristate "USB-Wishbone adapter interface driver"
         help
@@ -710,23 +679,6 @@ config USB_SERIAL_QT2
           To compile this driver as a module, choose M here: the
           module will be called quatech-serial.
 
-config USB_SERIAL_FLASHLOADER
-        tristate "Infineon Modem Flashloader USB interface driver"
-        help
-          Say Y here if you want to download Infineon Modem
-          via USB Flashloader serial driver.
-
-          To compile this driver as a module, choose M here: the
-          module will be called flashloader.
-
-config USB_SERIAL_SUUNTO
-        tristate "USB Suunto ANT+ driver"
-        help
-          Say Y here if you want to use the Suunto ANT+ USB device.
-
-          To compile this driver as a module, choose M here: the
-          module will be called suunto.
-
 config USB_SERIAL_DEBUG
         tristate "USB Debugging Device"
         help