Commit 537b8a86 authored by Johan Hovold's avatar Johan Hovold
Browse files

Revert "USB: serial: add Moxa UPORT 11x0 driver" 



This reverts commit 0b2b093a.

Turns out the MOXA vendor driver was basically just a copy of the
ti_usb_3410_5052 driver. We don't want two drivers for the same chip
even if mxu11x0 had gotten some much needed clean up before merge. So
let's remove the mxu11x0 driver, add support for these Moxa devices to
the TI driver, and then clean that driver up instead.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c0992d0f

drivers/usb/serial/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -475,22 +475,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_MXUPORT11

	tristate "USB Moxa UPORT 11x0 Serial Driver"

	---help---

	  Say Y here if you want to use a MOXA UPort 11x0 Serial hub.



	  This driver supports:



	  - UPort 1110  : 1 port RS-232 USB to Serial Hub.

	  - UPort 1130  : 1 port RS-422/485 USB to Serial Hub.

	  - UPort 1130I : 1 port RS-422/485 USB to Serial Hub with Isolation.

	  - UPort 1150  : 1 port RS-232/422/485 USB to Serial Hub.

	  - UPort 1150I : 1 port RS-232/422/485 USB to Serial Hub with Isolation.



	  To compile this driver as a module, choose M here: the

	  module will be called mxu11x0.



config USB_SERIAL_MXUPORT

	tristate "USB Moxa UPORT Serial Driver"

	---help---

drivers/usb/serial/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 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_MXUPORT)		+= mxuport.o

obj-$(CONFIG_USB_SERIAL_MXUPORT11)		+= mxu11x0.o

obj-$(CONFIG_USB_SERIAL_NAVMAN)			+= navman.o

obj-$(CONFIG_USB_SERIAL_OMNINET)		+= omninet.o

obj-$(CONFIG_USB_SERIAL_OPTICON)		+= opticon.o

drivers/usb/serial/mxu11x0.c

deleted100644 → 0
+0 −1006

File deleted.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE