Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

USB: serial: remove endpoints setting checks from core and header

Browse source 
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>
This commit is contained in:
Greg Kroah-Hartman 2008-04-16 09:17:38 -07:00
parent 0ba4034e20
commit 9aebfd6bda
2 changed files with 0 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/usb/serial/usb-serial.c
View file

@ -861,22 +861,6 @@ int usb_serial_probe(struct usb_interface *interface,
serial->num_interrupt_in = num_interrupt_in; serial->num_interrupt_in = num_interrupt_in;
serial->num_interrupt_out = num_interrupt_out; 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 */ /* found all that we need */
dev_info(&interface->dev, "%s converter detected\n", dev_info(&interface->dev, "%s converter detected\n",
type->description); type->description);

18
include/linux/usb/serial.h
View file

@ -145,8 +145,6 @@ struct usb_serial {
}; };
#define to_usb_serial(d) container_of(d, struct usb_serial, kref) #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 */ /* get and set the serial private data pointer helper functions */
static inline void *usb_get_serial_data(struct usb_serial *serial) static inline void *usb_get_serial_data(struct usb_serial *serial)
{ {
@ -164,18 +162,6 @@ static inline void usb_set_serial_data(struct usb_serial *serial, void *data)
* used in the syslog messages when a device is inserted or removed. * 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 * @id_table: pointer to a list of usb_device_id structures that define all
* of the devices this structure can support. * 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. * @num_ports: the number of different ports this device will have.
* @calc_num_ports: pointer to a function to determine how many ports this * @calc_num_ports: pointer to a function to determine how many ports this
* device has dynamically. It will be called after the probe() * device has dynamically. It will be called after the probe()
@ -211,10 +197,6 @@ static inline void usb_set_serial_data(struct usb_serial *serial, void *data)
struct usb_serial_driver { struct usb_serial_driver {
const char *description; const char *description;
const struct usb_device_id *id_table; 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; char num_ports;
struct list_head driver_list; struct list_head driver_list;