Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f923071 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarWei Shuai <cpuwolf@gmail.com>
Cc: Josh Triplett <josh@joshtriplett.org>
Acked-by: default avatarFrans Klaver <frans.klaver@xsens.com>
Cc: "Wesley W. Terpstra" <w.terpstra@gsi.de>
Cc: Johan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3804fad4

drivers/usb/serial/Kconfig

+18 −66
Original line number Diff line number Diff line
@@ -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

drivers/usb/serial/Makefile

+1 −8
Original line number Diff line number Diff line
@@ -24,9 +24,7 @@ obj-$(CONFIG_USB_SERIAL_EDGEPORT_TI) += io_ti.o 
obj-$(CONFIG_USB_SERIAL_EMPEG)			+= empeg.o

obj-$(CONFIG_USB_SERIAL_F81232)			+= f81232.o

obj-$(CONFIG_USB_SERIAL_FTDI_SIO)		+= ftdi_sio.o

obj-$(CONFIG_USB_SERIAL_FUNSOFT)		+= funsoft.o

obj-$(CONFIG_USB_SERIAL_GARMIN)			+= garmin_gps.o

obj-$(CONFIG_USB_SERIAL_HP4X)			+= hp4x.o

obj-$(CONFIG_USB_SERIAL_IPAQ)			+= ipaq.o

obj-$(CONFIG_USB_SERIAL_IPW)			+= ipw.o

obj-$(CONFIG_USB_SERIAL_IR)			+= ir-usb.o
@@ -39,7 +37,6 @@ obj-$(CONFIG_USB_SERIAL_MCT_U232) += mct_u232.o 
obj-$(CONFIG_USB_SERIAL_METRO)			+= metro-usb.o

obj-$(CONFIG_USB_SERIAL_MOS7720)		+= mos7720.o

obj-$(CONFIG_USB_SERIAL_MOS7840)		+= mos7840.o

obj-$(CONFIG_USB_SERIAL_MOTOROLA)		+= moto_modem.o

obj-$(CONFIG_USB_SERIAL_NAVMAN)			+= navman.o

obj-$(CONFIG_USB_SERIAL_OMNINET)		+= omninet.o

obj-$(CONFIG_USB_SERIAL_OPTICON)		+= opticon.o
@@ -50,11 +47,10 @@ obj-$(CONFIG_USB_SERIAL_QCAUX) += qcaux.o 
obj-$(CONFIG_USB_SERIAL_QUALCOMM)		+= qcserial.o

obj-$(CONFIG_USB_SERIAL_QT2)			+= quatech2.o

obj-$(CONFIG_USB_SERIAL_SAFE)			+= safe_serial.o

obj-$(CONFIG_USB_SERIAL_SIEMENS_MPI)		+= siemens_mpi.o

obj-$(CONFIG_USB_SERIAL_SIERRAWIRELESS)		+= sierra.o

obj-$(CONFIG_USB_SERIAL_SIMPLE)			+= usb-serial-simple.o

obj-$(CONFIG_USB_SERIAL_SPCP8X5)		+= spcp8x5.o

obj-$(CONFIG_USB_SERIAL_SSU100)			+= ssu100.o

obj-$(CONFIG_USB_SERIAL_SUUNTO)			+= suunto.o

obj-$(CONFIG_USB_SERIAL_SYMBOL)			+= symbolserial.o

obj-$(CONFIG_USB_SERIAL_WWAN)			+= usb_wwan.o

obj-$(CONFIG_USB_SERIAL_TI)			+= ti_usb_3410_5052.o
@@ -62,8 +58,5 @@ obj-$(CONFIG_USB_SERIAL_VISOR) += visor.o 
obj-$(CONFIG_USB_SERIAL_WISHBONE)		+= wishbone-serial.o

obj-$(CONFIG_USB_SERIAL_WHITEHEAT)		+= whiteheat.o

obj-$(CONFIG_USB_SERIAL_XIRCOM)			+= keyspan_pda.o

obj-$(CONFIG_USB_SERIAL_VIVOPAY_SERIAL)		+= vivopay-serial.o

obj-$(CONFIG_USB_SERIAL_XSENS_MT)		+= xsens_mt.o

obj-$(CONFIG_USB_SERIAL_ZIO)			+= zio.o

obj-$(CONFIG_USB_SERIAL_ZTE)			+= zte_ev.o
 
obj-$(CONFIG_USB_SERIAL_FLASHLOADER)		+= flashloader.o

drivers/usb/serial/flashloader.c

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/*

 * Infineon Flashloader driver

 *

 * Copyright (C) 2013 Wei Shuai <cpuwolf@gmail.com>

 *

 *	This program is free software; you can redistribute it and/or

 *	modify it under the terms of the GNU General Public License version

 *	2 as published by the Free Software Foundation.

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/tty.h>

#include <linux/module.h>

#include <linux/usb.h>

#include <linux/usb/serial.h>

#include <linux/uaccess.h>



static const struct usb_device_id id_table[] = {

	{ USB_DEVICE(0x8087, 0x0716) },

	{ },

};

MODULE_DEVICE_TABLE(usb, id_table);



static struct usb_serial_driver flashloader_device = {

	.driver = {

		.owner =	THIS_MODULE,

		.name =		"flashloader",

	},

	.id_table =		id_table,

	.num_ports =		1,

};



static struct usb_serial_driver * const serial_drivers[] = {

	&flashloader_device, NULL

};



module_usb_serial_driver(serial_drivers, id_table);

MODULE_LICENSE("GPL");

drivers/usb/serial/funsoft.c

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
/*

 * Funsoft Serial USB driver

 *

 * Copyright (C) 2006 Greg Kroah-Hartman <gregkh@suse.de>

 *

 *	This program is free software; you can redistribute it and/or

 *	modify it under the terms of the GNU General Public License version

 *	2 as published by the Free Software Foundation.

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/tty.h>

#include <linux/module.h>

#include <linux/usb.h>

#include <linux/usb/serial.h>

#include <linux/uaccess.h>



static const struct usb_device_id id_table[] = {

	{ USB_DEVICE(0x1404, 0xcddc) },

	{ },

};

MODULE_DEVICE_TABLE(usb, id_table);



static struct usb_serial_driver funsoft_device = {

	.driver = {

		.owner =	THIS_MODULE,

		.name =		"funsoft",

	},

	.id_table =		id_table,

	.num_ports =		1,

};



static struct usb_serial_driver * const serial_drivers[] = {

	&funsoft_device, NULL

};



module_usb_serial_driver(serial_drivers, id_table);



MODULE_LICENSE("GPL");

drivers/usb/serial/hp4x.c

deleted100644 → 0
+0 −51
Original line number Diff line number Diff line 
/*

 * HP4x Calculators Serial USB driver

 *

 * Copyright (C) 2005 Arthur Huillet (ahuillet@users.sf.net)

 * Copyright (C) 2001-2005 Greg Kroah-Hartman (greg@kroah.com)

 *

 *	This program is free software; you can redistribute it and/or modify

 *	it under the terms of the GNU General Public License as published by

 *	the Free Software Foundation; either version 2 of the License, or

 *	(at your option) any later version.

 *

 * See Documentation/usb/usb-serial.txt for more information on using this

 * driver

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/tty.h>

#include <linux/module.h>

#include <linux/usb.h>

#include <linux/usb/serial.h>



#define DRIVER_DESC "HP4x (48/49) Generic Serial driver"



#define HP_VENDOR_ID 0x03f0

#define HP49GP_PRODUCT_ID 0x0121



static const struct usb_device_id id_table[] = {

	{ USB_DEVICE(HP_VENDOR_ID, HP49GP_PRODUCT_ID) },

	{ }					/* Terminating entry */

};



MODULE_DEVICE_TABLE(usb, id_table);



static struct usb_serial_driver hp49gp_device = {

	.driver = {

		.owner =	THIS_MODULE,

		.name =		"hp4X",

	},

	.id_table =		id_table,

	.num_ports =		1,

};



static struct usb_serial_driver * const serial_drivers[] = {

	&hp49gp_device, NULL

};



module_usb_serial_driver(serial_drivers, id_table);



MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_LICENSE("GPL");