Hi all,
Here's a patch against 2.5.1-pre1 that removes the needs_interrupt,
needs_bulk_in, and needs_bulk_out fields from the struct
usb_serial_device_type. They weren't ever really used by any driver,
and were quite useless.
If anyone has any problems with this change, please let me know.
Otherwise I'll be sending this off to Linus in a few days.
thanks,
greg k-h
diff -Nru a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
--- a/drivers/usb/serial/belkin_sa.c Mon Nov 26 21:33:28 2001
+++ b/drivers/usb/serial/belkin_sa.c Mon Nov 26 21:33:28 2001
@@ -143,9 +143,6 @@
static struct usb_serial_device_type belkin_dockstation_device = {
name: "Belkin F5U120-PC USB Serial Adapter",
id_table: belkin_dockstation_table, /* the Belkin
F5U103 device */
- needs_interrupt_in: MUST_HAVE, /* this device must
have an interrupt in endpoint */
- needs_bulk_in: MUST_HAVE, /* this device must
have a bulk in endpoint */
- needs_bulk_out: MUST_HAVE, /* this device must
have a bulk out endpoint */
num_interrupt_in: 1,
num_bulk_in: 1,
num_bulk_out: 1,
@@ -164,9 +161,6 @@
static struct usb_serial_device_type belkin_sa_device = {
name: "Belkin F5U103 USB Serial Adapter",
id_table: belkin_sa_table, /* the Belkin F5U103
device */
- needs_interrupt_in: MUST_HAVE, /* this device must
have an interrupt in endpoint */
- needs_bulk_in: MUST_HAVE, /* this device must
have a bulk in endpoint */
- needs_bulk_out: MUST_HAVE, /* this device must
have a bulk out endpoint */
num_interrupt_in: 1,
num_bulk_in: 1,
num_bulk_out: 1,
@@ -186,9 +180,6 @@
static struct usb_serial_device_type belkin_old_device = {
name: "Belkin USB Serial Adapter",
id_table: belkin_old_table, /* the old Belkin
device */
- needs_interrupt_in: MUST_HAVE, /* this device must
have an interrupt in endpoint */
- needs_bulk_in: MUST_HAVE, /* this device must
have a bulk in endpoint */
- needs_bulk_out: MUST_HAVE, /* this device must
have a bulk out endpoint */
num_interrupt_in: 1,
num_bulk_in: 1,
num_bulk_out: 1,
@@ -207,9 +198,6 @@
static struct usb_serial_device_type peracom_device = {
name: "Peracom single port USB Serial Adapter",
id_table: peracom_table, /* the Peracom device
*/
- needs_interrupt_in: MUST_HAVE, /* this device must
have an interrupt in endpoint */
- needs_bulk_in: MUST_HAVE, /* this device must
have a bulk in endpoint */
- needs_bulk_out: MUST_HAVE, /* this device must
have a bulk out endpoint */
num_interrupt_in: 1,
num_bulk_in: 1,
num_bulk_out: 1,
@@ -228,9 +216,6 @@
static struct usb_serial_device_type gocom232_device = {
name: "GO-COM232 USB Serial Converter",
id_table: gocom232_table, /* the GO-COM232
device */
- needs_interrupt_in: MUST_HAVE, /* this device must
have an interrupt in endpoint */
- needs_bulk_in: MUST_HAVE, /* this device must
have a bulk in endpoint */
- needs_bulk_out: MUST_HAVE, /* this device must
have a bulk out endpoint */
num_interrupt_in: 1,
num_bulk_in: 1,
num_bulk_out: 1,
diff -Nru a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
--- a/drivers/usb/serial/cyberjack.c Mon Nov 26 21:33:28 2001
+++ b/drivers/usb/serial/cyberjack.c Mon Nov 26 21:33:28 2001
@@ -79,9 +79,6 @@
static struct usb_serial_device_type cyberjack_device = {
name: "Reiner SCT Cyberjack USB card reader",
id_table: id_table,
- needs_interrupt_in: MUST_HAVE,
- needs_bulk_in: MUST_HAVE,
- needs_bulk_out: MUST_HAVE,
num_interrupt_in: 1,
num_bulk_in: 1,
num_bulk_out: 1,
diff -Nru a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
--- a/drivers/usb/serial/digi_acceleport.c Mon Nov 26 21:33:28 2001
+++ b/drivers/usb/serial/digi_acceleport.c Mon Nov 26 21:33:28 2001
@@ -500,9 +500,6 @@
static struct usb_serial_device_type digi_acceleport_2_device = {
name: "Digi USB",
id_table: id_table_2,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: MUST_HAVE,
- needs_bulk_out: MUST_HAVE,
num_interrupt_in: 0,
num_bulk_in: 4,
num_bulk_out: 4,
@@ -526,9 +523,6 @@
static struct usb_serial_device_type digi_acceleport_4_device = {
name: "Digi USB",
id_table: id_table_4,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: MUST_HAVE,
- needs_bulk_out: MUST_HAVE,
num_interrupt_in: 0,
num_bulk_in: 5,
num_bulk_out: 5,
diff -Nru a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
--- a/drivers/usb/serial/empeg.c Mon Nov 26 21:33:28 2001
+++ b/drivers/usb/serial/empeg.c Mon Nov 26 21:33:28 2001
@@ -116,9 +116,6 @@
static struct usb_serial_device_type empeg_device = {
name: "Empeg",
id_table: id_table,
- needs_interrupt_in: MUST_HAVE_NOT, /* must not have an interrupt in
endpoint */
- needs_bulk_in: MUST_HAVE, /* must have a bulk in endpoint */
- needs_bulk_out: MUST_HAVE, /* must have a bulk out endpoint */
num_interrupt_in: 0,
num_bulk_in: 1,
num_bulk_out: 1,
diff -Nru a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
--- a/drivers/usb/serial/ftdi_sio.c Mon Nov 26 21:33:28 2001
+++ b/drivers/usb/serial/ftdi_sio.c Mon Nov 26 21:33:28 2001
@@ -176,9 +176,6 @@
static struct usb_serial_device_type ftdi_sio_device = {
name: "FTDI SIO",
id_table: id_table_sio,
- needs_interrupt_in: MUST_HAVE_NOT,
- needs_bulk_in: MUST_HAVE,
- needs_bulk_out: MUST_HAVE,
num_interrupt_in: 0,
num_bulk_in: 1,
num_bulk_out: 1,
@@ -199,9 +196,6 @@
static struct usb_serial_device_type ftdi_8U232AM_device = {
name: "FTDI 8U232AM",
id_table: id_table_8U232AM,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: MUST_HAVE,
- needs_bulk_out: MUST_HAVE,
num_interrupt_in: 0,
num_bulk_in: 1,
num_bulk_out: 1,
diff -Nru a/drivers/usb/serial/io_tables.h b/drivers/usb/serial/io_tables.h
--- a/drivers/usb/serial/io_tables.h Mon Nov 26 21:33:28 2001
+++ b/drivers/usb/serial/io_tables.h Mon Nov 26 21:33:28 2001
@@ -74,9 +74,6 @@
static struct usb_serial_device_type edgeport_1port_device = {
name: "Edgeport 1 port adapter",
id_table: edgeport_1port_id_table,
- needs_interrupt_in: MUST_HAVE,
- needs_bulk_in: MUST_HAVE,
- needs_bulk_out: MUST_HAVE,
num_interrupt_in: 1,
num_bulk_in: 1,
num_bulk_out: 1,
@@ -98,9 +95,6 @@
static struct usb_serial_device_type edgeport_2port_device = {
name: "Edgeport 2 port adapter",
id_table: edgeport_2port_id_table,
- needs_interrupt_in: MUST_HAVE,
- needs_bulk_in: MUST_HAVE,
- needs_bulk_out: MUST_HAVE,
num_interrupt_in: 1,
num_bulk_in: 1,
num_bulk_out: 1,
@@ -122,9 +116,6 @@
static struct usb_serial_device_type edgeport_4port_device = {
name: "Edgeport 4 port adapter",
id_table: edgeport_4port_id_table,
- needs_interrupt_in: MUST_HAVE,
- needs_bulk_in: MUST_HAVE,
- needs_bulk_out: MUST_HAVE,
num_interrupt_in: 1,
num_bulk_in: 1,
num_bulk_out: 1,
@@ -146,9 +137,6 @@
static struct usb_serial_device_type edgeport_8port_device = {
name: "Edgeport 8 port adapter",
id_table: edgeport_8port_id_table,
- needs_interrupt_in: MUST_HAVE,
- needs_bulk_in: MUST_HAVE,
- needs_bulk_out: MUST_HAVE,
num_interrupt_in: 1,
num_bulk_in: 1,
num_bulk_out: 1,
diff -Nru a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
--- a/drivers/usb/serial/ir-usb.c Mon Nov 26 21:33:28 2001
+++ b/drivers/usb/serial/ir-usb.c Mon Nov 26 21:33:28 2001
@@ -93,9 +93,6 @@
struct usb_serial_device_type ir_device = {
name: "IR Dongle",
id_table: id_table,
- needs_interrupt_in: MUST_HAVE,
- needs_bulk_in: MUST_HAVE,
- needs_bulk_out: MUST_HAVE,
num_interrupt_in: 1,
num_bulk_in: 1,
num_bulk_out: 1,
diff -Nru a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
--- a/drivers/usb/serial/keyspan.h Mon Nov 26 21:33:28 2001
+++ b/drivers/usb/serial/keyspan.h Mon Nov 26 21:33:28 2001
@@ -451,9 +451,6 @@
static struct usb_serial_device_type keyspan_usa18x_pre_device = {
name: "Keyspan USA18X - (without firmware)",
id_table: keyspan_usa18x_pre_ids,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: DONT_CARE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -464,9 +461,6 @@
static struct usb_serial_device_type keyspan_usa19_pre_device = {
name: "Keyspan USA19 - (without firmware)",
id_table: keyspan_usa19_pre_ids,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: DONT_CARE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -478,9 +472,6 @@
static struct usb_serial_device_type keyspan_usa19w_pre_device = {
name: "Keyspan USA19W - (without firmware)",
id_table: keyspan_usa19w_pre_ids,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: DONT_CARE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -492,9 +483,6 @@
static struct usb_serial_device_type keyspan_usa28_pre_device = {
name: "Keyspan USA28 - (without firmware)",
id_table: keyspan_usa28_pre_ids,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: DONT_CARE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -505,9 +493,6 @@
static struct usb_serial_device_type keyspan_usa28x_pre_device = {
name: "Keyspan USA28X - (without firmware)",
id_table: keyspan_usa28x_pre_ids,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: DONT_CARE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -518,9 +503,6 @@
static struct usb_serial_device_type keyspan_usa28xa_pre_device = {
name: "Keyspan USA28XA - (without firmware)",
id_table: keyspan_usa28xa_pre_ids,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: DONT_CARE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -531,9 +513,6 @@
static struct usb_serial_device_type keyspan_usa28xb_pre_device = {
name: "Keyspan USA28XB - (without firmware)",
id_table: keyspan_usa28xb_pre_ids,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: DONT_CARE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -544,9 +523,6 @@
static struct usb_serial_device_type keyspan_usa49w_pre_device = {
name: "Keyspan USA49W - (without firmware)",
id_table: keyspan_usa49w_pre_ids,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: DONT_CARE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -557,9 +533,6 @@
static struct usb_serial_device_type keyspan_usa18x_device = {
name: "Keyspan USA18X",
id_table: keyspan_usa18x_ids,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: MUST_HAVE,
- needs_bulk_out: MUST_HAVE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: 3,
num_bulk_out: 4,
@@ -583,9 +556,6 @@
static struct usb_serial_device_type keyspan_usa19_device = {
name: "Keyspan USA19",
id_table: keyspan_usa19_ids,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: MUST_HAVE,
- needs_bulk_out: MUST_HAVE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: 3,
num_bulk_out: 4,
@@ -610,9 +580,6 @@
static struct usb_serial_device_type keyspan_usa19w_device = {
name: "Keyspan USA19W",
id_table: keyspan_usa19w_ids,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: MUST_HAVE,
- needs_bulk_out: MUST_HAVE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: 3,
num_bulk_out: 4,
@@ -637,9 +604,6 @@
static struct usb_serial_device_type keyspan_usa28_device = {
name: "Keyspan USA28",
id_table: keyspan_usa28_ids,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: DONT_CARE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -655,9 +619,6 @@
static struct usb_serial_device_type keyspan_usa28x_device = {
name: "Keyspan USA28X/XB",
id_table: keyspan_usa28x_ids,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: DONT_CARE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -682,9 +643,6 @@
static struct usb_serial_device_type keyspan_usa28xa_device = {
name: "Keyspan USA28XA",
id_table: keyspan_usa28xa_ids,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: DONT_CARE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -709,9 +667,6 @@
static struct usb_serial_device_type keyspan_usa49w_device = {
name: "Keyspan USA49W",
id_table: keyspan_usa49w_ids,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: MUST_HAVE,
- needs_bulk_out: MUST_HAVE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: 5,
num_bulk_out: 5,
diff -Nru a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
--- a/drivers/usb/serial/keyspan_pda.c Mon Nov 26 21:33:28 2001
+++ b/drivers/usb/serial/keyspan_pda.c Mon Nov 26 21:33:28 2001
@@ -843,9 +843,6 @@
static struct usb_serial_device_type keyspan_pda_fake_device = {
name: "Keyspan PDA - (prerenumeration)",
id_table: id_table_fake,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: DONT_CARE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -858,9 +855,6 @@
static struct usb_serial_device_type xircom_pgs_fake_device = {
name: "Xircom PGS - (prerenumeration)",
id_table: id_table_fake_xircom,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: DONT_CARE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -871,9 +865,6 @@
static struct usb_serial_device_type entregra_pgs_fake_device = {
name: "Entregra PGS - (prerenumeration)",
id_table: id_table_fake_entregra,
- needs_interrupt_in: DONT_CARE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: DONT_CARE,
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -885,9 +876,6 @@
static struct usb_serial_device_type keyspan_pda_device = {
name: "Keyspan PDA",
id_table: id_table_std,
- needs_interrupt_in: MUST_HAVE,
- needs_bulk_in: DONT_CARE,
- needs_bulk_out: MUST_HAVE,
num_interrupt_in: 1,
num_bulk_in: 0,
num_bulk_out: 1,
diff -Nru a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
--- a/drivers/usb/serial/mct_u232.c Mon Nov 26 21:33:28 2001
+++ b/drivers/usb/serial/mct_u232.c Mon Nov 26 21:33:28 2001
@@ -157,9 +157,6 @@
static struct usb_serial_device_type mct_u232_device = {
name: "Magic Control Technology USB-RS232",
id_table: mct_u232_table,
- needs_interrupt_in: MUST_HAVE, /* 2 interrupt-in endpoints */
- needs_bulk_in: MUST_HAVE_NOT, /* no bulk-in endpoint */
- needs_bulk_out: MUST_HAVE, /* 1 bulk-out endpoint */
num_interrupt_in: 2,
num_bulk_in: 0,
num_bulk_out: 1,
@@ -181,9 +178,6 @@
static struct usb_serial_device_type mct_u232_sitecom_device = {
name: "MCT/Sitecom USB-RS232",
id_table: mct_u232_sitecom_table,
- needs_interrupt_in: MUST_HAVE, /* 2 interrupt-in endpoints */
- needs_bulk_in: MUST_HAVE_NOT, /* no bulk-in endpoint */
- needs_bulk_out: MUST_HAVE, /* 1 bulk-out endpoint */
num_interrupt_in: 2,
num_bulk_in: 0,
num_bulk_out: 1,
@@ -205,9 +199,6 @@
static struct usb_serial_device_type mct_u232_du_h3sp_device = {
name: "MCT/D-Link DU-H3SP USB BAY",
id_table: mct_u232_du_h3sp_table,
- needs_interrupt_in: MUST_HAVE, /* 2 interrupt-in endpoints */
- needs_bulk_in: MUST_HAVE_NOT, /* no bulk-in endpoint */
- needs_bulk_out: MUST_HAVE, /* 1 bulk-out endpoint */
num_interrupt_in: 2,
num_bulk_in: 0,
num_bulk_out: 1,
diff -Nru a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
--- a/drivers/usb/serial/omninet.c Mon Nov 26 21:33:28 2001
+++ b/drivers/usb/serial/omninet.c Mon Nov 26 21:33:28 2001
@@ -90,9 +90,6 @@
static struct usb_serial_device_type zyxel_omninet_device = {
name: "ZyXEL - omni.net lcd plus usb",
id_table: id_table,
- needs_interrupt_in: MUST_HAVE,
- needs_bulk_in: MUST_HAVE,
- needs_bulk_out: MUST_HAVE,
num_interrupt_in: 1,
num_bulk_in: 1,
num_bulk_out: 2,
diff -Nru a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
--- a/drivers/usb/serial/pl2303.c Mon Nov 26 21:33:28 2001
+++ b/drivers/usb/serial/pl2303.c Mon Nov 26 21:33:28 2001
@@ -118,9 +118,6 @@
static struct usb_serial_device_type pl2303_device = {
name: "PL-2303",
id_table: id_table,
- needs_interrupt_in: DONT_CARE, /* this device must have an
interrupt in endpoint */
- needs_bulk_in: MUST_HAVE, /* this device must have a
bulk in endpoint */
- needs_bulk_out: MUST_HAVE, /* this device must have a
bulk out endpoint */
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: 1,
num_bulk_out: 1,
diff -Nru a/drivers/usb/serial/usb-serial.h b/drivers/usb/serial/usb-serial.h
--- a/drivers/usb/serial/usb-serial.h Mon Nov 26 21:33:28 2001
+++ b/drivers/usb/serial/usb-serial.h Mon Nov 26 21:33:28 2001
@@ -108,13 +108,6 @@
};
-#define MUST_HAVE_NOT 0x01
-#define MUST_HAVE 0x02
-#define DONT_CARE 0x03
-
-#define HAS 0x02
-#define HAS_NOT 0x01
-
#define NUM_DONT_CARE (-1)
@@ -122,9 +115,6 @@
struct usb_serial_device_type {
char *name;
const struct usb_device_id *id_table;
- char needs_interrupt_in;
- char needs_bulk_in;
- char needs_bulk_out;
char num_interrupt_in;
char num_bulk_in;
char num_bulk_out;
diff -Nru a/drivers/usb/serial/usbserial.c b/drivers/usb/serial/usbserial.c
--- a/drivers/usb/serial/usbserial.c Mon Nov 26 21:33:28 2001
+++ b/drivers/usb/serial/usbserial.c Mon Nov 26 21:33:28 2001
@@ -339,9 +339,6 @@
static struct usb_serial_device_type generic_device = {
name: "Generic",
id_table: generic_device_ids,
- needs_interrupt_in: DONT_CARE, /* don't have to have an
interrupt in endpoint */
- needs_bulk_in: DONT_CARE, /* don't have to have a bulk
in endpoint */
- needs_bulk_out: DONT_CARE, /* don't have to have a bulk
out endpoint */
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -1068,9 +1065,6 @@
int minor;
int buffer_size;
int i;
- char interrupt_pipe;
- char bulk_in_pipe;
- char bulk_out_pipe;
int num_interrupt_in = 0;
int num_bulk_in = 0;
int num_bulk_out = 0;
@@ -1097,10 +1091,8 @@
dbg("none matched");
return(NULL);
}
-
+
/* descriptor matches, let's find the endpoints needed */
- interrupt_pipe = bulk_in_pipe = bulk_out_pipe = HAS_NOT;
-
/* check out the endpoints */
iface_desc = &interface->altsetting[0];
for (i = 0; i < iface_desc->bNumEndpoints; ++i) {
@@ -1110,7 +1102,6 @@
((endpoint->bmAttributes & 3) == 0x02)) {
/* we found a bulk in endpoint */
dbg("found bulk in");
- bulk_in_pipe = HAS;
bulk_in_endpoint[num_bulk_in] = endpoint;
++num_bulk_in;
}
@@ -1119,7 +1110,6 @@
((endpoint->bmAttributes & 3) == 0x02)) {
/* we found a bulk out endpoint */
dbg("found bulk out");
- bulk_out_pipe = HAS;
bulk_out_endpoint[num_bulk_out] = endpoint;
++num_bulk_out;
}
@@ -1128,7 +1118,6 @@
((endpoint->bmAttributes & 3) == 0x03)) {
/* we found a interrupt in endpoint */
dbg("found interrupt in");
- interrupt_pipe = HAS;
interrupt_in_endpoint[num_interrupt_in] = endpoint;
++num_interrupt_in;
}
@@ -1151,7 +1140,6 @@
((endpoint->bmAttributes & 3) == 0x03)) {
/* we found a interrupt in endpoint */
dbg("found interrupt in for Prolific device on
separate interface");
- interrupt_pipe = HAS;
interrupt_in_endpoint[num_interrupt_in] =
endpoint;
++num_interrupt_in;
}
@@ -1161,15 +1149,6 @@
/* END HORRIBLE HACK FOR PL2303 */
#endif
- /* verify that we found all of the endpoints that we need */
- if (!((interrupt_pipe & type->needs_interrupt_in) &&
- (bulk_in_pipe & type->needs_bulk_in) &&
- (bulk_out_pipe & type->needs_bulk_out))) {
- /* nope, they don't match what we expected */
- info("descriptors matched, but endpoints did not");
- return NULL;
- }
-
/* found all that we need */
info("%s converter detected", type->name);
diff -Nru a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
--- a/drivers/usb/serial/visor.c Mon Nov 26 21:33:28 2001
+++ b/drivers/usb/serial/visor.c Mon Nov 26 21:33:28 2001
@@ -187,9 +187,6 @@
static struct usb_serial_device_type handspring_device = {
name: "Handspring Visor",
id_table: visor_id_table,
- needs_interrupt_in: MUST_HAVE_NOT, /* this device must not have
an interrupt in endpoint */
- needs_bulk_in: MUST_HAVE, /* this device must have a
bulk in endpoint */
- needs_bulk_out: MUST_HAVE, /* this device must have a
bulk out endpoint */
num_interrupt_in: 0,
num_bulk_in: 2,
num_bulk_out: 2,
@@ -213,9 +210,6 @@
static struct usb_serial_device_type palm_4_0_device = {
name: "Palm 4.0",
id_table: palm_4_0_id_table,
- needs_interrupt_in: MUST_HAVE_NOT, /* this device must not have
an interrupt in endpoint */
- needs_bulk_in: MUST_HAVE, /* this device must have a
bulk in endpoint */
- needs_bulk_out: MUST_HAVE, /* this device must have a
bulk out endpoint */
num_interrupt_in: 0,
num_bulk_in: 2,
num_bulk_out: 2,
@@ -240,9 +234,6 @@
static struct usb_serial_device_type clie_3_5_device = {
name: "Sony Cli� 3.5",
id_table: clie_id_3_5_table,
- needs_interrupt_in: MUST_HAVE_NOT, /* this device must not have
an interrupt in endpoint */
- needs_bulk_in: MUST_HAVE, /* this device must have a
bulk in endpoint */
- needs_bulk_out: MUST_HAVE, /* this device must have a
bulk out endpoint */
num_interrupt_in: 0,
num_bulk_in: 1,
num_bulk_out: 1,
@@ -264,9 +255,6 @@
static struct usb_serial_device_type clie_4_0_device = {
name: "Sony Cli� 4.0",
id_table: clie_id_4_0_table,
- needs_interrupt_in: MUST_HAVE_NOT, /* this device must not have
an interrupt in endpoint */
- needs_bulk_in: MUST_HAVE, /* this device must have a
bulk in endpoint */
- needs_bulk_out: MUST_HAVE, /* this device must have a
bulk out endpoint */
num_interrupt_in: 0,
num_bulk_in: 2,
num_bulk_out: 2,
diff -Nru a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
--- a/drivers/usb/serial/whiteheat.c Mon Nov 26 21:33:28 2001
+++ b/drivers/usb/serial/whiteheat.c Mon Nov 26 21:33:28 2001
@@ -134,9 +134,6 @@
static struct usb_serial_device_type whiteheat_fake_device = {
name: "Connect Tech - WhiteHEAT - (prerenumeration)",
id_table: id_table_prerenumeration,
- needs_interrupt_in: DONT_CARE, /* don't have
to have an interrupt in endpoint */
- needs_bulk_in: DONT_CARE, /* don't have
to have a bulk in endpoint */
- needs_bulk_out: DONT_CARE, /* don't have
to have a bulk out endpoint */
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
@@ -147,9 +144,6 @@
static struct usb_serial_device_type whiteheat_device = {
name: "Connect Tech - WhiteHEAT",
id_table: id_table_std,
- needs_interrupt_in: DONT_CARE, /* don't have
to have an interrupt in endpoint */
- needs_bulk_in: DONT_CARE, /* don't have
to have a bulk in endpoint */
- needs_bulk_out: DONT_CARE, /* don't have
to have a bulk out endpoint */
num_interrupt_in: NUM_DONT_CARE,
num_bulk_in: NUM_DONT_CARE,
num_bulk_out: NUM_DONT_CARE,
