USB: serial: remove endpoints setting checks from core and header
Remove the unused check for num_interrupt and friends as well as remove
them from the header file because no usb-serial drivers no longer
reference them.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index aea861e..5b46481 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -861,22 +861,6 @@
serial->num_interrupt_in = num_interrupt_in;
serial->num_interrupt_out = num_interrupt_out;
-#if 0
- /* check that the device meets the driver's requirements */
- if ((type->num_interrupt_in != NUM_DONT_CARE &&
- type->num_interrupt_in != num_interrupt_in)
- || (type->num_interrupt_out != NUM_DONT_CARE &&
- type->num_interrupt_out != num_interrupt_out)
- || (type->num_bulk_in != NUM_DONT_CARE &&
- type->num_bulk_in != num_bulk_in)
- || (type->num_bulk_out != NUM_DONT_CARE &&
- type->num_bulk_out != num_bulk_out)) {
- dbg("wrong number of endpoints");
- kfree(serial);
- return -EIO;
- }
-#endif
-
/* found all that we need */
dev_info(&interface->dev, "%s converter detected\n",
type->description);
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index f1b7434..8f891cb 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -145,8 +145,6 @@
};
#define to_usb_serial(d) container_of(d, struct usb_serial, kref)
-#define NUM_DONT_CARE 99
-
/* get and set the serial private data pointer helper functions */
static inline void *usb_get_serial_data(struct usb_serial *serial)
{
@@ -164,18 +162,6 @@
* used in the syslog messages when a device is inserted or removed.
* @id_table: pointer to a list of usb_device_id structures that define all
* of the devices this structure can support.
- * @num_interrupt_in: If a device doesn't have this many interrupt-in
- * endpoints, it won't be sent to the driver's attach() method.
- * (But it might still be sent to the probe() method.)
- * @num_interrupt_out: If a device doesn't have this many interrupt-out
- * endpoints, it won't be sent to the driver's attach() method.
- * (But it might still be sent to the probe() method.)
- * @num_bulk_in: If a device doesn't have this many bulk-in
- * endpoints, it won't be sent to the driver's attach() method.
- * (But it might still be sent to the probe() method.)
- * @num_bulk_out: If a device doesn't have this many bulk-out
- * endpoints, it won't be sent to the driver's attach() method.
- * (But it might still be sent to the probe() method.)
* @num_ports: the number of different ports this device will have.
* @calc_num_ports: pointer to a function to determine how many ports this
* device has dynamically. It will be called after the probe()
@@ -211,10 +197,6 @@
struct usb_serial_driver {
const char *description;
const struct usb_device_id *id_table;
- char num_interrupt_in;
- char num_interrupt_out;
- char num_bulk_in;
- char num_bulk_out;
char num_ports;
struct list_head driver_list;