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

Commit 19de4278 authored by Johan Hovold's avatar Johan Hovold
Browse files

USB: ftdi_sio: remove redundant mtxorb quirk 



Remove redundant mtxorb quirk used to fix up incorrect wMaxPacketSize,
which was added before 895f28ba ("USB: ftdi_sio: fix hi-speed device
packet size calculation") which does the same thing for all devices.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 47e57595

drivers/usb/serial/ftdi_sio.c

+8 −39
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ struct ftdi_sio_quirk { 
};



static int   ftdi_jtag_probe(struct usb_serial *serial);

static int   ftdi_mtxorb_hack_setup(struct usb_serial *serial);

static int   ftdi_NDI_device_setup(struct usb_serial *serial);

static int   ftdi_stmclite_probe(struct usb_serial *serial);

static int   ftdi_8u2232c_probe(struct usb_serial *serial);
@@ -98,10 +97,6 @@ static struct ftdi_sio_quirk ftdi_jtag_quirk = { 
	.probe	= ftdi_jtag_probe,

};



static struct ftdi_sio_quirk ftdi_mtxorb_hack_quirk = {

	.probe  = ftdi_mtxorb_hack_setup,

};



static struct ftdi_sio_quirk ftdi_NDI_device_quirk = {

	.probe	= ftdi_NDI_device_setup,

};
@@ -256,14 +251,12 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0124_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0125_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0126_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0127_PID),

		.driver_info = (kernel_ulong_t)&ftdi_mtxorb_hack_quirk },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0127_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0128_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0129_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_012A_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_012B_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_012C_PID),

		.driver_info = (kernel_ulong_t)&ftdi_mtxorb_hack_quirk },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_012C_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_012D_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_012E_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_012F_PID) },
@@ -302,18 +295,12 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0150_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0151_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0152_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0153_PID),

		.driver_info = (kernel_ulong_t)&ftdi_mtxorb_hack_quirk },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0154_PID),

		.driver_info = (kernel_ulong_t)&ftdi_mtxorb_hack_quirk },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0155_PID),

		.driver_info = (kernel_ulong_t)&ftdi_mtxorb_hack_quirk },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0156_PID),

		.driver_info = (kernel_ulong_t)&ftdi_mtxorb_hack_quirk },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0157_PID),

		.driver_info = (kernel_ulong_t)&ftdi_mtxorb_hack_quirk },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0158_PID),

		.driver_info = (kernel_ulong_t)&ftdi_mtxorb_hack_quirk },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0153_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0154_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0155_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0156_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0157_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0158_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0159_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_015A_PID) },

	{ USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_015B_PID) },
@@ -1858,24 +1845,6 @@ static int ftdi_stmclite_probe(struct usb_serial *serial) 
	return 0;

}



/*

 * The Matrix Orbital VK204-25-USB has an invalid IN endpoint.

 * We have to correct it if we want to read from it.

 */

static int ftdi_mtxorb_hack_setup(struct usb_serial *serial)

{

	struct usb_host_endpoint *ep = serial->dev->ep_in[1];

	struct usb_endpoint_descriptor *ep_desc = &ep->desc;



	if (ep->enabled && ep_desc->wMaxPacketSize == 0) {

		ep_desc->wMaxPacketSize = cpu_to_le16(0x40);

		dev_info(&serial->dev->dev,

			 "Fixing invalid wMaxPacketSize on read pipe\n");

	}



	return 0;

}



static int ftdi_sio_port_remove(struct usb_serial_port *port)

{

	struct ftdi_private *priv = usb_get_serial_port_data(port);