[PATCH] USB: allow usb drivers to disable dynamic ids
This lets drivers, like the usb-serial ones, disable the ability to add ids from sysfs. The usb-serial drivers are "odd" in that they are really usb-serial bus drivers, not usb bus drivers, so the dynamic id logic will have to go into the usb-serial bus core for those drivers to get that ability. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
@@ -28,6 +28,7 @@ static struct usb_driver airprime_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
static struct usb_serial_driver airprime_device = {
|
||||
|
@@ -32,6 +32,7 @@ static struct usb_driver anydata_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
static int anydata_open(struct usb_serial_port *port, struct file *filp)
|
||||
|
@@ -118,6 +118,7 @@ static struct usb_driver belkin_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table_combined,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
/* All of the device info needed for the serial converters */
|
||||
|
@@ -72,6 +72,7 @@ static struct usb_driver cp2101_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
static struct usb_serial_driver cp2101_device = {
|
||||
|
@@ -81,6 +81,7 @@ static struct usb_driver cyberjack_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
static struct usb_serial_driver cyberjack_device = {
|
||||
|
@@ -112,6 +112,7 @@ static struct usb_driver cypress_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table_combined,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
struct cypress_private {
|
||||
|
@@ -498,6 +498,7 @@ static struct usb_driver digi_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table_combined,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
|
||||
|
@@ -110,6 +110,7 @@ static struct usb_driver empeg_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
static struct usb_serial_driver empeg_device = {
|
||||
|
@@ -488,6 +488,7 @@ static struct usb_driver ftdi_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table_combined,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
static char *ftdi_chip_name[] = {
|
||||
|
@@ -227,6 +227,7 @@ static struct usb_driver garmin_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
|
||||
|
@@ -73,6 +73,7 @@ static struct usb_driver generic_driver = {
|
||||
.probe = generic_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = generic_serial_ids,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
#endif
|
||||
|
||||
|
@@ -42,6 +42,7 @@ static struct usb_driver hp49gp_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
static struct usb_serial_driver hp49gp_device = {
|
||||
|
@@ -247,6 +247,7 @@ static struct usb_driver io_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table_combined,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
/* function prototypes for all of our local functions */
|
||||
|
@@ -221,6 +221,7 @@ static struct usb_driver io_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table_combined,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
|
||||
|
@@ -547,6 +547,7 @@ static struct usb_driver ipaq_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = ipaq_id_table,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
|
||||
|
@@ -157,6 +157,7 @@ static struct usb_driver usb_ipw_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = usb_ipw_ids,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
static int debug;
|
||||
|
@@ -130,6 +130,7 @@ static struct usb_driver ir_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
|
||||
|
@@ -525,6 +525,7 @@ static struct usb_driver keyspan_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = keyspan_ids_combined,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
/* usb_device_id table for the pre-firmware download keyspan devices */
|
||||
|
@@ -155,6 +155,7 @@ static struct usb_driver keyspan_pda_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table_combined,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
static struct usb_device_id id_table_std [] = {
|
||||
|
@@ -121,6 +121,7 @@ static struct usb_driver kl5kusb105d_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
static struct usb_serial_driver kl5kusb105d_device = {
|
||||
|
@@ -102,6 +102,7 @@ static struct usb_driver kobil_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
|
||||
|
@@ -130,6 +130,7 @@ static struct usb_driver mct_u232_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table_combined,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
static struct usb_serial_driver mct_u232_device = {
|
||||
|
@@ -85,6 +85,7 @@ static struct usb_driver omninet_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
|
||||
|
@@ -100,6 +100,7 @@ static struct usb_driver option_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = option_ids,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
/* The card has three separate interfaces, wich the serial driver
|
||||
|
@@ -87,6 +87,7 @@ static struct usb_driver pl2303_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
#define SET_LINE_REQUEST_TYPE 0x21
|
||||
|
@@ -165,6 +165,7 @@ static struct usb_driver safe_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
static __u16 crc10_table[256] = {
|
||||
|
@@ -253,6 +253,7 @@ static struct usb_driver ti_usb_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = ti_id_table_combined,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
static struct usb_serial_driver ti_1port_device = {
|
||||
|
@@ -46,6 +46,7 @@ static struct usb_driver usb_serial_driver = {
|
||||
.name = "usbserial",
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
/* There is no MODULE_DEVICE_TABLE for usbserial.c. Instead
|
||||
|
@@ -178,6 +178,7 @@ static struct usb_driver visor_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table_combined,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
/* All of the device info needed for the Handspring Visor, and Palm 4.0 devices */
|
||||
|
@@ -132,6 +132,7 @@ static struct usb_driver whiteheat_driver = {
|
||||
.probe = usb_serial_probe,
|
||||
.disconnect = usb_serial_disconnect,
|
||||
.id_table = id_table_combined,
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
/* function prototypes for the Connect Tech WhiteHEAT prerenumeration device */
|
||||
|
Reference in New Issue
Block a user