diff options
39 files changed, 0 insertions, 175 deletions
diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c index f156dba0300..d5bcb377403 100644 --- a/drivers/usb/serial/airprime.c +++ b/drivers/usb/serial/airprime.c | |||
| @@ -306,9 +306,6 @@ static struct usb_serial_driver airprime_device = { | |||
| 306 | }, | 306 | }, |
| 307 | .usb_driver = &airprime_driver, | 307 | .usb_driver = &airprime_driver, |
| 308 | .id_table = id_table, | 308 | .id_table = id_table, |
| 309 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 310 | .num_bulk_in = NUM_DONT_CARE, | ||
| 311 | .num_bulk_out = NUM_DONT_CARE, | ||
| 312 | .open = airprime_open, | 309 | .open = airprime_open, |
| 313 | .close = airprime_close, | 310 | .close = airprime_close, |
| 314 | .write = airprime_write, | 311 | .write = airprime_write, |
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c index fe2bfd67ba8..aa7a6838a3d 100644 --- a/drivers/usb/serial/ark3116.c +++ b/drivers/usb/serial/ark3116.c | |||
| @@ -447,9 +447,6 @@ static struct usb_serial_driver ark3116_device = { | |||
| 447 | }, | 447 | }, |
| 448 | .id_table = id_table, | 448 | .id_table = id_table, |
| 449 | .usb_driver = &ark3116_driver, | 449 | .usb_driver = &ark3116_driver, |
| 450 | .num_interrupt_in = 1, | ||
| 451 | .num_bulk_in = 1, | ||
| 452 | .num_bulk_out = 1, | ||
| 453 | .num_ports = 1, | 450 | .num_ports = 1, |
| 454 | .attach = ark3116_attach, | 451 | .attach = ark3116_attach, |
| 455 | .set_termios = ark3116_set_termios, | 452 | .set_termios = ark3116_set_termios, |
diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c index df0a2b3b029..b6950648804 100644 --- a/drivers/usb/serial/belkin_sa.c +++ b/drivers/usb/serial/belkin_sa.c | |||
| @@ -128,9 +128,6 @@ static struct usb_serial_driver belkin_device = { | |||
| 128 | .description = "Belkin / Peracom / GoHubs USB Serial Adapter", | 128 | .description = "Belkin / Peracom / GoHubs USB Serial Adapter", |
| 129 | .usb_driver = &belkin_driver, | 129 | .usb_driver = &belkin_driver, |
| 130 | .id_table = id_table_combined, | 130 | .id_table = id_table_combined, |
| 131 | .num_interrupt_in = 1, | ||
| 132 | .num_bulk_in = 1, | ||
| 133 | .num_bulk_out = 1, | ||
| 134 | .num_ports = 1, | 131 | .num_ports = 1, |
| 135 | .open = belkin_sa_open, | 132 | .open = belkin_sa_open, |
| 136 | .close = belkin_sa_close, | 133 | .close = belkin_sa_close, |
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index 42582d49b69..d947d955bce 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c | |||
| @@ -318,9 +318,6 @@ static struct usb_serial_driver ch341_device = { | |||
| 318 | }, | 318 | }, |
| 319 | .id_table = id_table, | 319 | .id_table = id_table, |
| 320 | .usb_driver = &ch341_driver, | 320 | .usb_driver = &ch341_driver, |
| 321 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 322 | .num_bulk_in = 1, | ||
| 323 | .num_bulk_out = 1, | ||
| 324 | .num_ports = 1, | 321 | .num_ports = 1, |
| 325 | .open = ch341_open, | 322 | .open = ch341_open, |
| 326 | .set_termios = ch341_set_termios, | 323 | .set_termios = ch341_set_termios, |
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c index 3b4fa94ecf2..2af8d21bb12 100644 --- a/drivers/usb/serial/cp2101.c +++ b/drivers/usb/serial/cp2101.c | |||
| @@ -109,9 +109,6 @@ static struct usb_serial_driver cp2101_device = { | |||
| 109 | }, | 109 | }, |
| 110 | .usb_driver = &cp2101_driver, | 110 | .usb_driver = &cp2101_driver, |
| 111 | .id_table = id_table, | 111 | .id_table = id_table, |
| 112 | .num_interrupt_in = 0, | ||
| 113 | .num_bulk_in = NUM_DONT_CARE, | ||
| 114 | .num_bulk_out = NUM_DONT_CARE, | ||
| 115 | .num_ports = 1, | 112 | .num_ports = 1, |
| 116 | .open = cp2101_open, | 113 | .open = cp2101_open, |
| 117 | .close = cp2101_close, | 114 | .close = cp2101_close, |
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c index 8d9b045aa7e..cbae876cd67 100644 --- a/drivers/usb/serial/cyberjack.c +++ b/drivers/usb/serial/cyberjack.c | |||
| @@ -90,9 +90,6 @@ static struct usb_serial_driver cyberjack_device = { | |||
| 90 | .description = "Reiner SCT Cyberjack USB card reader", | 90 | .description = "Reiner SCT Cyberjack USB card reader", |
| 91 | .usb_driver = &cyberjack_driver, | 91 | .usb_driver = &cyberjack_driver, |
| 92 | .id_table = id_table, | 92 | .id_table = id_table, |
| 93 | .num_interrupt_in = 1, | ||
| 94 | .num_bulk_in = 1, | ||
| 95 | .num_bulk_out = 1, | ||
| 96 | .num_ports = 1, | 93 | .num_ports = 1, |
| 97 | .attach = cyberjack_startup, | 94 | .attach = cyberjack_startup, |
| 98 | .shutdown = cyberjack_shutdown, | 95 | .shutdown = cyberjack_shutdown, |
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index 36f8ef07947..d8304eaf34c 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c | |||
| @@ -200,10 +200,6 @@ static struct usb_serial_driver cypress_earthmate_device = { | |||
| 200 | .description = "DeLorme Earthmate USB", | 200 | .description = "DeLorme Earthmate USB", |
| 201 | .usb_driver = &cypress_driver, | 201 | .usb_driver = &cypress_driver, |
| 202 | .id_table = id_table_earthmate, | 202 | .id_table = id_table_earthmate, |
| 203 | .num_interrupt_in = 1, | ||
| 204 | .num_interrupt_out = 1, | ||
| 205 | .num_bulk_in = NUM_DONT_CARE, | ||
| 206 | .num_bulk_out = NUM_DONT_CARE, | ||
| 207 | .num_ports = 1, | 203 | .num_ports = 1, |
| 208 | .attach = cypress_earthmate_startup, | 204 | .attach = cypress_earthmate_startup, |
| 209 | .shutdown = cypress_shutdown, | 205 | .shutdown = cypress_shutdown, |
| @@ -230,10 +226,6 @@ static struct usb_serial_driver cypress_hidcom_device = { | |||
| 230 | .description = "HID->COM RS232 Adapter", | 226 | .description = "HID->COM RS232 Adapter", |
| 231 | .usb_driver = &cypress_driver, | 227 | .usb_driver = &cypress_driver, |
| 232 | .id_table = id_table_cyphidcomrs232, | 228 | .id_table = id_table_cyphidcomrs232, |
| 233 | .num_interrupt_in = 1, | ||
| 234 | .num_interrupt_out = 1, | ||
| 235 | .num_bulk_in = NUM_DONT_CARE, | ||
| 236 | .num_bulk_out = NUM_DONT_CARE, | ||
| 237 | .num_ports = 1, | 229 | .num_ports = 1, |
| 238 | .attach = cypress_hidcom_startup, | 230 | .attach = cypress_hidcom_startup, |
| 239 | .shutdown = cypress_shutdown, | 231 | .shutdown = cypress_shutdown, |
| @@ -260,10 +252,6 @@ static struct usb_serial_driver cypress_ca42v2_device = { | |||
| 260 | .description = "Nokia CA-42 V2 Adapter", | 252 | .description = "Nokia CA-42 V2 Adapter", |
| 261 | .usb_driver = &cypress_driver, | 253 | .usb_driver = &cypress_driver, |
| 262 | .id_table = id_table_nokiaca42v2, | 254 | .id_table = id_table_nokiaca42v2, |
| 263 | .num_interrupt_in = 1, | ||
| 264 | .num_interrupt_out = 1, | ||
| 265 | .num_bulk_in = NUM_DONT_CARE, | ||
| 266 | .num_bulk_out = NUM_DONT_CARE, | ||
| 267 | .num_ports = 1, | 255 | .num_ports = 1, |
| 268 | .attach = cypress_ca42v2_startup, | 256 | .attach = cypress_ca42v2_startup, |
| 269 | .shutdown = cypress_shutdown, | 257 | .shutdown = cypress_shutdown, |
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c index 5f9c6e46bee..4e3d5993a8e 100644 --- a/drivers/usb/serial/digi_acceleport.c +++ b/drivers/usb/serial/digi_acceleport.c | |||
| @@ -508,9 +508,6 @@ static struct usb_serial_driver digi_acceleport_2_device = { | |||
| 508 | .description = "Digi 2 port USB adapter", | 508 | .description = "Digi 2 port USB adapter", |
| 509 | .usb_driver = &digi_driver, | 509 | .usb_driver = &digi_driver, |
| 510 | .id_table = id_table_2, | 510 | .id_table = id_table_2, |
| 511 | .num_interrupt_in = 0, | ||
| 512 | .num_bulk_in = 4, | ||
| 513 | .num_bulk_out = 4, | ||
| 514 | .num_ports = 3, | 511 | .num_ports = 3, |
| 515 | .open = digi_open, | 512 | .open = digi_open, |
| 516 | .close = digi_close, | 513 | .close = digi_close, |
| @@ -538,9 +535,6 @@ static struct usb_serial_driver digi_acceleport_4_device = { | |||
| 538 | .description = "Digi 4 port USB adapter", | 535 | .description = "Digi 4 port USB adapter", |
| 539 | .usb_driver = &digi_driver, | 536 | .usb_driver = &digi_driver, |
| 540 | .id_table = id_table_4, | 537 | .id_table = id_table_4, |
| 541 | .num_interrupt_in = 0, | ||
| 542 | .num_bulk_in = 5, | ||
| 543 | .num_bulk_out = 5, | ||
| 544 | .num_ports = 4, | 538 | .num_ports = 4, |
| 545 | .open = digi_open, | 539 | .open = digi_open, |
| 546 | .close = digi_close, | 540 | .close = digi_close, |
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c index a5c8e1e17ea..2cf82177117 100644 --- a/drivers/usb/serial/empeg.c +++ b/drivers/usb/serial/empeg.c | |||
| @@ -118,9 +118,6 @@ static struct usb_serial_driver empeg_device = { | |||
| 118 | }, | 118 | }, |
| 119 | .id_table = id_table, | 119 | .id_table = id_table, |
| 120 | .usb_driver = &empeg_driver, | 120 | .usb_driver = &empeg_driver, |
| 121 | .num_interrupt_in = 0, | ||
| 122 | .num_bulk_in = 1, | ||
| 123 | .num_bulk_out = 1, | ||
| 124 | .num_ports = 1, | 121 | .num_ports = 1, |
| 125 | .open = empeg_open, | 122 | .open = empeg_open, |
| 126 | .close = empeg_close, | 123 | .close = empeg_close, |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 496c0c93ad8..54b502f2924 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -439,9 +439,6 @@ static struct usb_serial_driver ftdi_sio_device = { | |||
| 439 | .description = "FTDI USB Serial Device", | 439 | .description = "FTDI USB Serial Device", |
| 440 | .usb_driver = &ftdi_driver , | 440 | .usb_driver = &ftdi_driver , |
| 441 | .id_table = id_table_combined, | 441 | .id_table = id_table_combined, |
| 442 | .num_interrupt_in = 0, | ||
| 443 | .num_bulk_in = 1, | ||
| 444 | .num_bulk_out = 1, | ||
| 445 | .num_ports = 1, | 442 | .num_ports = 1, |
| 446 | .probe = ftdi_sio_probe, | 443 | .probe = ftdi_sio_probe, |
| 447 | .port_probe = ftdi_sio_port_probe, | 444 | .port_probe = ftdi_sio_port_probe, |
diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c index b5194dc7d3b..e8ba2cb5995 100644 --- a/drivers/usb/serial/funsoft.c +++ b/drivers/usb/serial/funsoft.c | |||
| @@ -39,9 +39,6 @@ static struct usb_serial_driver funsoft_device = { | |||
| 39 | }, | 39 | }, |
| 40 | .id_table = id_table, | 40 | .id_table = id_table, |
| 41 | .usb_driver = &funsoft_driver, | 41 | .usb_driver = &funsoft_driver, |
| 42 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 43 | .num_bulk_in = NUM_DONT_CARE, | ||
| 44 | .num_bulk_out = NUM_DONT_CARE, | ||
| 45 | .num_ports = 1, | 42 | .num_ports = 1, |
| 46 | }; | 43 | }; |
| 47 | 44 | ||
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c index d74e43d6923..87b77f92ae0 100644 --- a/drivers/usb/serial/garmin_gps.c +++ b/drivers/usb/serial/garmin_gps.c | |||
| @@ -1579,9 +1579,6 @@ static struct usb_serial_driver garmin_device = { | |||
| 1579 | .description = "Garmin GPS usb/tty", | 1579 | .description = "Garmin GPS usb/tty", |
| 1580 | .usb_driver = &garmin_driver, | 1580 | .usb_driver = &garmin_driver, |
| 1581 | .id_table = id_table, | 1581 | .id_table = id_table, |
| 1582 | .num_interrupt_in = 1, | ||
| 1583 | .num_bulk_in = 1, | ||
| 1584 | .num_bulk_out = 1, | ||
| 1585 | .num_ports = 1, | 1582 | .num_ports = 1, |
| 1586 | .open = garmin_open, | 1583 | .open = garmin_open, |
| 1587 | .close = garmin_close, | 1584 | .close = garmin_close, |
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index 7cfce9dabb9..5b0952054de 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c | |||
| @@ -62,9 +62,6 @@ struct usb_serial_driver usb_serial_generic_device = { | |||
| 62 | }, | 62 | }, |
| 63 | .id_table = generic_device_ids, | 63 | .id_table = generic_device_ids, |
| 64 | .usb_driver = &generic_driver, | 64 | .usb_driver = &generic_driver, |
| 65 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 66 | .num_bulk_in = NUM_DONT_CARE, | ||
| 67 | .num_bulk_out = NUM_DONT_CARE, | ||
| 68 | .num_ports = 1, | 65 | .num_ports = 1, |
| 69 | .shutdown = usb_serial_generic_shutdown, | 66 | .shutdown = usb_serial_generic_shutdown, |
| 70 | .throttle = usb_serial_generic_throttle, | 67 | .throttle = usb_serial_generic_throttle, |
diff --git a/drivers/usb/serial/hp4x.c b/drivers/usb/serial/hp4x.c index 6c6ebae741c..75b88b356eb 100644 --- a/drivers/usb/serial/hp4x.c +++ b/drivers/usb/serial/hp4x.c | |||
| @@ -50,9 +50,6 @@ static struct usb_serial_driver hp49gp_device = { | |||
| 50 | }, | 50 | }, |
| 51 | .id_table = id_table, | 51 | .id_table = id_table, |
| 52 | .usb_driver = &hp49gp_driver, | 52 | .usb_driver = &hp49gp_driver, |
| 53 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 54 | .num_bulk_in = NUM_DONT_CARE, | ||
| 55 | .num_bulk_out = NUM_DONT_CARE, | ||
| 56 | .num_ports = 1, | 53 | .num_ports = 1, |
| 57 | }; | 54 | }; |
| 58 | 55 | ||
diff --git a/drivers/usb/serial/io_tables.h b/drivers/usb/serial/io_tables.h index 6d300877254..2ec85893f27 100644 --- a/drivers/usb/serial/io_tables.h +++ b/drivers/usb/serial/io_tables.h | |||
| @@ -111,9 +111,6 @@ static struct usb_serial_driver edgeport_2port_device = { | |||
| 111 | .description = "Edgeport 2 port adapter", | 111 | .description = "Edgeport 2 port adapter", |
| 112 | .usb_driver = &io_driver, | 112 | .usb_driver = &io_driver, |
| 113 | .id_table = edgeport_2port_id_table, | 113 | .id_table = edgeport_2port_id_table, |
| 114 | .num_interrupt_in = 1, | ||
| 115 | .num_bulk_in = 1, | ||
| 116 | .num_bulk_out = 1, | ||
| 117 | .num_ports = 2, | 114 | .num_ports = 2, |
| 118 | .open = edge_open, | 115 | .open = edge_open, |
| 119 | .close = edge_close, | 116 | .close = edge_close, |
| @@ -142,9 +139,6 @@ static struct usb_serial_driver edgeport_4port_device = { | |||
| 142 | .description = "Edgeport 4 port adapter", | 139 | .description = "Edgeport 4 port adapter", |
| 143 | .usb_driver = &io_driver, | 140 | .usb_driver = &io_driver, |
| 144 | .id_table = edgeport_4port_id_table, | 141 | .id_table = edgeport_4port_id_table, |
| 145 | .num_interrupt_in = 1, | ||
| 146 | .num_bulk_in = 1, | ||
| 147 | .num_bulk_out = 1, | ||
| 148 | .num_ports = 4, | 142 | .num_ports = 4, |
| 149 | .open = edge_open, | 143 | .open = edge_open, |
| 150 | .close = edge_close, | 144 | .close = edge_close, |
| @@ -173,9 +167,6 @@ static struct usb_serial_driver edgeport_8port_device = { | |||
| 173 | .description = "Edgeport 8 port adapter", | 167 | .description = "Edgeport 8 port adapter", |
| 174 | .usb_driver = &io_driver, | 168 | .usb_driver = &io_driver, |
| 175 | .id_table = edgeport_8port_id_table, | 169 | .id_table = edgeport_8port_id_table, |
| 176 | .num_interrupt_in = 1, | ||
| 177 | .num_bulk_in = 1, | ||
| 178 | .num_bulk_out = 1, | ||
| 179 | .num_ports = 8, | 170 | .num_ports = 8, |
| 180 | .open = edge_open, | 171 | .open = edge_open, |
| 181 | .close = edge_close, | 172 | .close = edge_close, |
| @@ -203,9 +194,6 @@ static struct usb_serial_driver epic_device = { | |||
| 203 | }, | 194 | }, |
| 204 | .description = "EPiC device", | 195 | .description = "EPiC device", |
| 205 | .id_table = Epic_port_id_table, | 196 | .id_table = Epic_port_id_table, |
| 206 | .num_interrupt_in = 1, | ||
| 207 | .num_bulk_in = 1, | ||
| 208 | .num_bulk_out = 1, | ||
| 209 | .num_ports = 1, | 197 | .num_ports = 1, |
| 210 | .open = edge_open, | 198 | .open = edge_open, |
| 211 | .close = edge_close, | 199 | .close = edge_close, |
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index 316467ecd77..856e4d9afd6 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c | |||
| @@ -3032,9 +3032,6 @@ static struct usb_serial_driver edgeport_1port_device = { | |||
| 3032 | .description = "Edgeport TI 1 port adapter", | 3032 | .description = "Edgeport TI 1 port adapter", |
| 3033 | .usb_driver = &io_driver, | 3033 | .usb_driver = &io_driver, |
| 3034 | .id_table = edgeport_1port_id_table, | 3034 | .id_table = edgeport_1port_id_table, |
| 3035 | .num_interrupt_in = 1, | ||
| 3036 | .num_bulk_in = 1, | ||
| 3037 | .num_bulk_out = 1, | ||
| 3038 | .num_ports = 1, | 3035 | .num_ports = 1, |
| 3039 | .open = edge_open, | 3036 | .open = edge_open, |
| 3040 | .close = edge_close, | 3037 | .close = edge_close, |
| @@ -3064,9 +3061,6 @@ static struct usb_serial_driver edgeport_2port_device = { | |||
| 3064 | .description = "Edgeport TI 2 port adapter", | 3061 | .description = "Edgeport TI 2 port adapter", |
| 3065 | .usb_driver = &io_driver, | 3062 | .usb_driver = &io_driver, |
| 3066 | .id_table = edgeport_2port_id_table, | 3063 | .id_table = edgeport_2port_id_table, |
| 3067 | .num_interrupt_in = 1, | ||
| 3068 | .num_bulk_in = 2, | ||
| 3069 | .num_bulk_out = 2, | ||
| 3070 | .num_ports = 2, | 3064 | .num_ports = 2, |
| 3071 | .open = edge_open, | 3065 | .open = edge_open, |
| 3072 | .close = edge_close, | 3066 | .close = edge_close, |
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c index 17f2a53b8ba..1711dda0ea6 100644 --- a/drivers/usb/serial/ipaq.c +++ b/drivers/usb/serial/ipaq.c | |||
| @@ -570,9 +570,6 @@ static struct usb_serial_driver ipaq_device = { | |||
| 570 | .description = "PocketPC PDA", | 570 | .description = "PocketPC PDA", |
| 571 | .usb_driver = &ipaq_driver, | 571 | .usb_driver = &ipaq_driver, |
| 572 | .id_table = ipaq_id_table, | 572 | .id_table = ipaq_id_table, |
| 573 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 574 | .num_bulk_in = NUM_DONT_CARE, | ||
| 575 | .num_bulk_out = NUM_DONT_CARE, | ||
| 576 | .num_ports = 2, | 573 | .num_ports = 2, |
| 577 | .open = ipaq_open, | 574 | .open = ipaq_open, |
| 578 | .close = ipaq_close, | 575 | .close = ipaq_close, |
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c index cbe5530f3db..ec0ccd14e18 100644 --- a/drivers/usb/serial/ipw.c +++ b/drivers/usb/serial/ipw.c | |||
| @@ -448,9 +448,6 @@ static struct usb_serial_driver ipw_device = { | |||
| 448 | .description = "IPWireless converter", | 448 | .description = "IPWireless converter", |
| 449 | .usb_driver = &usb_ipw_driver, | 449 | .usb_driver = &usb_ipw_driver, |
| 450 | .id_table = usb_ipw_ids, | 450 | .id_table = usb_ipw_ids, |
| 451 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 452 | .num_bulk_in = 1, | ||
| 453 | .num_bulk_out = 1, | ||
| 454 | .num_ports = 1, | 451 | .num_ports = 1, |
| 455 | .open = ipw_open, | 452 | .open = ipw_open, |
| 456 | .close = ipw_close, | 453 | .close = ipw_close, |
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c index 6b803ab9854..82e12f8d600 100644 --- a/drivers/usb/serial/ir-usb.c +++ b/drivers/usb/serial/ir-usb.c | |||
| @@ -145,9 +145,6 @@ static struct usb_serial_driver ir_device = { | |||
| 145 | .description = "IR Dongle", | 145 | .description = "IR Dongle", |
| 146 | .usb_driver = &ir_driver, | 146 | .usb_driver = &ir_driver, |
| 147 | .id_table = id_table, | 147 | .id_table = id_table, |
| 148 | .num_interrupt_in = 1, | ||
| 149 | .num_bulk_in = 1, | ||
| 150 | .num_bulk_out = 1, | ||
| 151 | .num_ports = 1, | 148 | .num_ports = 1, |
| 152 | .set_termios = ir_set_termios, | 149 | .set_termios = ir_set_termios, |
| 153 | .attach = ir_startup, | 150 | .attach = ir_startup, |
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c index a09b9a85b16..7fee53441c2 100644 --- a/drivers/usb/serial/iuu_phoenix.c +++ b/drivers/usb/serial/iuu_phoenix.c | |||
| @@ -1162,9 +1162,6 @@ static struct usb_serial_driver iuu_device = { | |||
| 1162 | .name = "iuu_phoenix", | 1162 | .name = "iuu_phoenix", |
| 1163 | }, | 1163 | }, |
| 1164 | .id_table = id_table, | 1164 | .id_table = id_table, |
| 1165 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 1166 | .num_bulk_in = 1, | ||
| 1167 | .num_bulk_out = 1, | ||
| 1168 | .num_ports = 1, | 1165 | .num_ports = 1, |
| 1169 | .open = iuu_open, | 1166 | .open = iuu_open, |
| 1170 | .close = iuu_close, | 1167 | .close = iuu_close, |
diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h index 74ce8bca3e6..8d6ed0293bf 100644 --- a/drivers/usb/serial/keyspan.h +++ b/drivers/usb/serial/keyspan.h | |||
| @@ -636,10 +636,6 @@ static struct usb_serial_driver keyspan_pre_device = { | |||
| 636 | }, | 636 | }, |
| 637 | .description = "Keyspan - (without firmware)", | 637 | .description = "Keyspan - (without firmware)", |
| 638 | .id_table = keyspan_pre_ids, | 638 | .id_table = keyspan_pre_ids, |
| 639 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 640 | .num_interrupt_out = NUM_DONT_CARE, | ||
| 641 | .num_bulk_in = NUM_DONT_CARE, | ||
| 642 | .num_bulk_out = NUM_DONT_CARE, | ||
| 643 | .num_ports = 1, | 639 | .num_ports = 1, |
| 644 | .attach = keyspan_fake_startup, | 640 | .attach = keyspan_fake_startup, |
| 645 | }; | 641 | }; |
| @@ -651,10 +647,6 @@ static struct usb_serial_driver keyspan_1port_device = { | |||
| 651 | }, | 647 | }, |
| 652 | .description = "Keyspan 1 port adapter", | 648 | .description = "Keyspan 1 port adapter", |
| 653 | .id_table = keyspan_1port_ids, | 649 | .id_table = keyspan_1port_ids, |
| 654 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 655 | .num_interrupt_out = NUM_DONT_CARE, | ||
| 656 | .num_bulk_in = NUM_DONT_CARE, | ||
| 657 | .num_bulk_out = NUM_DONT_CARE, | ||
| 658 | .num_ports = 1, | 650 | .num_ports = 1, |
| 659 | .open = keyspan_open, | 651 | .open = keyspan_open, |
| 660 | .close = keyspan_close, | 652 | .close = keyspan_close, |
| @@ -679,10 +671,6 @@ static struct usb_serial_driver keyspan_2port_device = { | |||
| 679 | }, | 671 | }, |
| 680 | .description = "Keyspan 2 port adapter", | 672 | .description = "Keyspan 2 port adapter", |
| 681 | .id_table = keyspan_2port_ids, | 673 | .id_table = keyspan_2port_ids, |
| 682 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 683 | .num_interrupt_out = NUM_DONT_CARE, | ||
| 684 | .num_bulk_in = NUM_DONT_CARE, | ||
| 685 | .num_bulk_out = NUM_DONT_CARE, | ||
| 686 | .num_ports = 2, | 674 | .num_ports = 2, |
| 687 | .open = keyspan_open, | 675 | .open = keyspan_open, |
| 688 | .close = keyspan_close, | 676 | .close = keyspan_close, |
| @@ -707,10 +695,6 @@ static struct usb_serial_driver keyspan_4port_device = { | |||
| 707 | }, | 695 | }, |
| 708 | .description = "Keyspan 4 port adapter", | 696 | .description = "Keyspan 4 port adapter", |
| 709 | .id_table = keyspan_4port_ids, | 697 | .id_table = keyspan_4port_ids, |
| 710 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 711 | .num_interrupt_out = NUM_DONT_CARE, | ||
| 712 | .num_bulk_in = NUM_DONT_CARE, | ||
| 713 | .num_bulk_out = NUM_DONT_CARE, | ||
| 714 | .num_ports = 4, | 698 | .num_ports = 4, |
| 715 | .open = keyspan_open, | 699 | .open = keyspan_open, |
| 716 | .close = keyspan_close, | 700 | .close = keyspan_close, |
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c index b1fa5a376e9..03984779518 100644 --- a/drivers/usb/serial/keyspan_pda.c +++ b/drivers/usb/serial/keyspan_pda.c | |||
| @@ -793,9 +793,6 @@ static struct usb_serial_driver keyspan_pda_fake_device = { | |||
| 793 | .description = "Keyspan PDA - (prerenumeration)", | 793 | .description = "Keyspan PDA - (prerenumeration)", |
| 794 | .usb_driver = &keyspan_pda_driver, | 794 | .usb_driver = &keyspan_pda_driver, |
| 795 | .id_table = id_table_fake, | 795 | .id_table = id_table_fake, |
| 796 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 797 | .num_bulk_in = NUM_DONT_CARE, | ||
| 798 | .num_bulk_out = NUM_DONT_CARE, | ||
| 799 | .num_ports = 1, | 796 | .num_ports = 1, |
| 800 | .attach = keyspan_pda_fake_startup, | 797 | .attach = keyspan_pda_fake_startup, |
| 801 | }; | 798 | }; |
| @@ -810,9 +807,6 @@ static struct usb_serial_driver xircom_pgs_fake_device = { | |||
| 810 | .description = "Xircom / Entregra PGS - (prerenumeration)", | 807 | .description = "Xircom / Entregra PGS - (prerenumeration)", |
| 811 | .usb_driver = &keyspan_pda_driver, | 808 | .usb_driver = &keyspan_pda_driver, |
| 812 | .id_table = id_table_fake_xircom, | 809 | .id_table = id_table_fake_xircom, |
| 813 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 814 | .num_bulk_in = NUM_DONT_CARE, | ||
| 815 | .num_bulk_out = NUM_DONT_CARE, | ||
| 816 | .num_ports = 1, | 810 | .num_ports = 1, |
| 817 | .attach = keyspan_pda_fake_startup, | 811 | .attach = keyspan_pda_fake_startup, |
| 818 | }; | 812 | }; |
| @@ -826,9 +820,6 @@ static struct usb_serial_driver keyspan_pda_device = { | |||
| 826 | .description = "Keyspan PDA", | 820 | .description = "Keyspan PDA", |
| 827 | .usb_driver = &keyspan_pda_driver, | 821 | .usb_driver = &keyspan_pda_driver, |
| 828 | .id_table = id_table_std, | 822 | .id_table = id_table_std, |
| 829 | .num_interrupt_in = 1, | ||
| 830 | .num_bulk_in = 0, | ||
| 831 | .num_bulk_out = 1, | ||
| 832 | .num_ports = 1, | 823 | .num_ports = 1, |
| 833 | .open = keyspan_pda_open, | 824 | .open = keyspan_pda_open, |
| 834 | .close = keyspan_pda_close, | 825 | .close = keyspan_pda_close, |
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c index 55736df7d2f..d7100428390 100644 --- a/drivers/usb/serial/kl5kusb105.c +++ b/drivers/usb/serial/kl5kusb105.c | |||
| @@ -126,9 +126,6 @@ static struct usb_serial_driver kl5kusb105d_device = { | |||
| 126 | .description = "KL5KUSB105D / PalmConnect", | 126 | .description = "KL5KUSB105D / PalmConnect", |
| 127 | .usb_driver = &kl5kusb105d_driver, | 127 | .usb_driver = &kl5kusb105d_driver, |
| 128 | .id_table = id_table, | 128 | .id_table = id_table, |
| 129 | .num_interrupt_in = 1, | ||
| 130 | .num_bulk_in = 1, | ||
| 131 | .num_bulk_out = 1, | ||
| 132 | .num_ports = 1, | 129 | .num_ports = 1, |
| 133 | .open = klsi_105_open, | 130 | .open = klsi_105_open, |
| 134 | .close = klsi_105_close, | 131 | .close = klsi_105_close, |
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c index 03cb5dd8cbe..78458c807ea 100644 --- a/drivers/usb/serial/kobil_sct.c +++ b/drivers/usb/serial/kobil_sct.c | |||
| @@ -113,10 +113,6 @@ static struct usb_serial_driver kobil_device = { | |||
| 113 | .description = "KOBIL USB smart card terminal", | 113 | .description = "KOBIL USB smart card terminal", |
| 114 | .usb_driver = &kobil_driver, | 114 | .usb_driver = &kobil_driver, |
| 115 | .id_table = id_table, | 115 | .id_table = id_table, |
| 116 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 117 | .num_interrupt_out = NUM_DONT_CARE, | ||
| 118 | .num_bulk_in = 0, | ||
| 119 | .num_bulk_out = 0, | ||
| 120 | .num_ports = 1, | 116 | .num_ports = 1, |
| 121 | .attach = kobil_startup, | 117 | .attach = kobil_startup, |
| 122 | .shutdown = kobil_shutdown, | 118 | .shutdown = kobil_shutdown, |
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c index fc1cea4aba1..b9e0fbacc8a 100644 --- a/drivers/usb/serial/mct_u232.c +++ b/drivers/usb/serial/mct_u232.c | |||
| @@ -143,9 +143,6 @@ static struct usb_serial_driver mct_u232_device = { | |||
| 143 | .description = "MCT U232", | 143 | .description = "MCT U232", |
| 144 | .usb_driver = &mct_u232_driver, | 144 | .usb_driver = &mct_u232_driver, |
| 145 | .id_table = id_table_combined, | 145 | .id_table = id_table_combined, |
| 146 | .num_interrupt_in = 2, | ||
| 147 | .num_bulk_in = 0, | ||
| 148 | .num_bulk_out = 1, | ||
| 149 | .num_ports = 1, | 146 | .num_ports = 1, |
| 150 | .open = mct_u232_open, | 147 | .open = mct_u232_open, |
| 151 | .close = mct_u232_close, | 148 | .close = mct_u232_close, |
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index 40f3a018880..2e14fdd0846 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c | |||
| @@ -1596,9 +1596,6 @@ static struct usb_serial_driver moschip7720_2port_driver = { | |||
| 1596 | .description = "Moschip 2 port adapter", | 1596 | .description = "Moschip 2 port adapter", |
| 1597 | .usb_driver = &usb_driver, | 1597 | .usb_driver = &usb_driver, |
| 1598 | .id_table = moschip_port_id_table, | 1598 | .id_table = moschip_port_id_table, |
| 1599 | .num_interrupt_in = 1, | ||
| 1600 | .num_bulk_in = 2, | ||
| 1601 | .num_bulk_out = 2, | ||
| 1602 | .num_ports = 2, | 1599 | .num_ports = 2, |
| 1603 | .open = mos7720_open, | 1600 | .open = mos7720_open, |
| 1604 | .close = mos7720_close, | 1601 | .close = mos7720_close, |
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 0b29c5383dc..37c4f0736bc 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c | |||
| @@ -2800,12 +2800,7 @@ static struct usb_serial_driver moschip7840_4port_device = { | |||
| 2800 | .description = DRIVER_DESC, | 2800 | .description = DRIVER_DESC, |
| 2801 | .usb_driver = &io_driver, | 2801 | .usb_driver = &io_driver, |
| 2802 | .id_table = moschip_port_id_table, | 2802 | .id_table = moschip_port_id_table, |
| 2803 | .num_interrupt_in = 1, //NUM_DONT_CARE,//1, | ||
| 2804 | #ifdef check | ||
| 2805 | .num_bulk_in = 4, | ||
| 2806 | .num_bulk_out = 4, | ||
| 2807 | .num_ports = 4, | 2803 | .num_ports = 4, |
| 2808 | #endif | ||
| 2809 | .open = mos7840_open, | 2804 | .open = mos7840_open, |
| 2810 | .close = mos7840_close, | 2805 | .close = mos7840_close, |
| 2811 | .write = mos7840_write, | 2806 | .write = mos7840_write, |
diff --git a/drivers/usb/serial/navman.c b/drivers/usb/serial/navman.c index 7f337c9aeb5..ddaccbcde84 100644 --- a/drivers/usb/serial/navman.c +++ b/drivers/usb/serial/navman.c | |||
| @@ -121,9 +121,6 @@ static struct usb_serial_driver navman_device = { | |||
| 121 | }, | 121 | }, |
| 122 | .id_table = id_table, | 122 | .id_table = id_table, |
| 123 | .usb_driver = &navman_driver, | 123 | .usb_driver = &navman_driver, |
| 124 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 125 | .num_bulk_in = NUM_DONT_CARE, | ||
| 126 | .num_bulk_out = NUM_DONT_CARE, | ||
| 127 | .num_ports = 1, | 124 | .num_ports = 1, |
| 128 | .open = navman_open, | 125 | .open = navman_open, |
| 129 | .close = navman_close, | 126 | .close = navman_close, |
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c index ee94d9616d8..050511ff2b1 100644 --- a/drivers/usb/serial/omninet.c +++ b/drivers/usb/serial/omninet.c | |||
| @@ -95,9 +95,6 @@ static struct usb_serial_driver zyxel_omninet_device = { | |||
| 95 | .description = "ZyXEL - omni.net lcd plus usb", | 95 | .description = "ZyXEL - omni.net lcd plus usb", |
| 96 | .usb_driver = &omninet_driver, | 96 | .usb_driver = &omninet_driver, |
| 97 | .id_table = id_table, | 97 | .id_table = id_table, |
| 98 | .num_interrupt_in = 1, | ||
| 99 | .num_bulk_in = 1, | ||
| 100 | .num_bulk_out = 2, | ||
| 101 | .num_ports = 1, | 98 | .num_ports = 1, |
| 102 | .attach = omninet_attach, | 99 | .attach = omninet_attach, |
| 103 | .open = omninet_open, | 100 | .open = omninet_open, |
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 130aa96746f..f4914209871 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
| @@ -325,9 +325,6 @@ static struct usb_serial_driver option_1port_device = { | |||
| 325 | .description = "GSM modem (1-port)", | 325 | .description = "GSM modem (1-port)", |
| 326 | .usb_driver = &option_driver, | 326 | .usb_driver = &option_driver, |
| 327 | .id_table = option_ids, | 327 | .id_table = option_ids, |
| 328 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 329 | .num_bulk_in = NUM_DONT_CARE, | ||
| 330 | .num_bulk_out = NUM_DONT_CARE, | ||
| 331 | .num_ports = 1, | 328 | .num_ports = 1, |
| 332 | .open = option_open, | 329 | .open = option_open, |
| 333 | .close = option_close, | 330 | .close = option_close, |
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c index 8acc907a318..20a680ed0cc 100644 --- a/drivers/usb/serial/oti6858.c +++ b/drivers/usb/serial/oti6858.c | |||
| @@ -179,9 +179,6 @@ static struct usb_serial_driver oti6858_device = { | |||
| 179 | .name = "oti6858", | 179 | .name = "oti6858", |
| 180 | }, | 180 | }, |
| 181 | .id_table = id_table, | 181 | .id_table = id_table, |
| 182 | .num_interrupt_in = 1, | ||
| 183 | .num_bulk_in = 1, | ||
| 184 | .num_bulk_out = 1, | ||
| 185 | .num_ports = 1, | 182 | .num_ports = 1, |
| 186 | .open = oti6858_open, | 183 | .open = oti6858_open, |
| 187 | .close = oti6858_close, | 184 | .close = oti6858_close, |
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index 2af778555bd..1fbb4dbdf23 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c | |||
| @@ -1114,9 +1114,6 @@ static struct usb_serial_driver pl2303_device = { | |||
| 1114 | }, | 1114 | }, |
| 1115 | .id_table = id_table, | 1115 | .id_table = id_table, |
| 1116 | .usb_driver = &pl2303_driver, | 1116 | .usb_driver = &pl2303_driver, |
| 1117 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 1118 | .num_bulk_in = 1, | ||
| 1119 | .num_bulk_out = 1, | ||
| 1120 | .num_ports = 1, | 1117 | .num_ports = 1, |
| 1121 | .open = pl2303_open, | 1118 | .open = pl2303_open, |
| 1122 | .close = pl2303_close, | 1119 | .close = pl2303_close, |
diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c index 4e6dcc199be..353c54fa058 100644 --- a/drivers/usb/serial/safe_serial.c +++ b/drivers/usb/serial/safe_serial.c | |||
| @@ -394,9 +394,6 @@ static struct usb_serial_driver safe_device = { | |||
| 394 | }, | 394 | }, |
| 395 | .id_table = id_table, | 395 | .id_table = id_table, |
| 396 | .usb_driver = &safe_driver, | 396 | .usb_driver = &safe_driver, |
| 397 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 398 | .num_bulk_in = NUM_DONT_CARE, | ||
| 399 | .num_bulk_out = NUM_DONT_CARE, | ||
| 400 | .num_ports = 1, | 397 | .num_ports = 1, |
| 401 | .write = safe_write, | 398 | .write = safe_write, |
| 402 | .write_room = safe_write_room, | 399 | .write_room = safe_write_room, |
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index f791eb8887f..07eabaf9f04 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c | |||
| @@ -746,9 +746,6 @@ static struct usb_serial_driver sierra_device = { | |||
| 746 | .description = "Sierra USB modem", | 746 | .description = "Sierra USB modem", |
| 747 | .id_table = id_table, | 747 | .id_table = id_table, |
| 748 | .usb_driver = &sierra_driver, | 748 | .usb_driver = &sierra_driver, |
| 749 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 750 | .num_bulk_in = NUM_DONT_CARE, | ||
| 751 | .num_bulk_out = NUM_DONT_CARE, | ||
| 752 | .calc_num_ports = sierra_calc_num_ports, | 749 | .calc_num_ports = sierra_calc_num_ports, |
| 753 | .probe = sierra_probe, | 750 | .probe = sierra_probe, |
| 754 | .open = sierra_open, | 751 | .open = sierra_open, |
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c index 1b46b846f10..2282d620186 100644 --- a/drivers/usb/serial/spcp8x5.c +++ b/drivers/usb/serial/spcp8x5.c | |||
| @@ -1022,9 +1022,6 @@ static struct usb_serial_driver spcp8x5_device = { | |||
| 1022 | .name = "SPCP8x5", | 1022 | .name = "SPCP8x5", |
| 1023 | }, | 1023 | }, |
| 1024 | .id_table = id_table, | 1024 | .id_table = id_table, |
| 1025 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 1026 | .num_bulk_in = 1, | ||
| 1027 | .num_bulk_out = 1, | ||
| 1028 | .num_ports = 1, | 1025 | .num_ports = 1, |
| 1029 | .open = spcp8x5_open, | 1026 | .open = spcp8x5_open, |
| 1030 | .close = spcp8x5_close, | 1027 | .close = spcp8x5_close, |
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index 5b470f76e91..f3bbf777c81 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c | |||
| @@ -264,9 +264,6 @@ static struct usb_serial_driver ti_1port_device = { | |||
| 264 | .description = "TI USB 3410 1 port adapter", | 264 | .description = "TI USB 3410 1 port adapter", |
| 265 | .usb_driver = &ti_usb_driver, | 265 | .usb_driver = &ti_usb_driver, |
| 266 | .id_table = ti_id_table_3410, | 266 | .id_table = ti_id_table_3410, |
| 267 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 268 | .num_bulk_in = NUM_DONT_CARE, | ||
| 269 | .num_bulk_out = 1, | ||
| 270 | .num_ports = 1, | 267 | .num_ports = 1, |
| 271 | .attach = ti_startup, | 268 | .attach = ti_startup, |
| 272 | .shutdown = ti_shutdown, | 269 | .shutdown = ti_shutdown, |
| @@ -295,9 +292,6 @@ static struct usb_serial_driver ti_2port_device = { | |||
| 295 | .description = "TI USB 5052 2 port adapter", | 292 | .description = "TI USB 5052 2 port adapter", |
| 296 | .usb_driver = &ti_usb_driver, | 293 | .usb_driver = &ti_usb_driver, |
| 297 | .id_table = ti_id_table_5052, | 294 | .id_table = ti_id_table_5052, |
| 298 | .num_interrupt_in = 1, | ||
| 299 | .num_bulk_in = 2, | ||
| 300 | .num_bulk_out = 2, | ||
| 301 | .num_ports = 2, | 295 | .num_ports = 2, |
| 302 | .attach = ti_startup, | 296 | .attach = ti_startup, |
| 303 | .shutdown = ti_shutdown, | 297 | .shutdown = ti_shutdown, |
diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c index 257a5e43687..f9fc926b56d 100644 --- a/drivers/usb/serial/usb_debug.c +++ b/drivers/usb/serial/usb_debug.c | |||
| @@ -35,9 +35,6 @@ static struct usb_serial_driver debug_device = { | |||
| 35 | .name = "debug", | 35 | .name = "debug", |
| 36 | }, | 36 | }, |
| 37 | .id_table = id_table, | 37 | .id_table = id_table, |
| 38 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 39 | .num_bulk_in = NUM_DONT_CARE, | ||
| 40 | .num_bulk_out = NUM_DONT_CARE, | ||
| 41 | .num_ports = 1, | 38 | .num_ports = 1, |
| 42 | }; | 39 | }; |
| 43 | 40 | ||
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c index c2b01f7c319..f2d59b06c36 100644 --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c | |||
| @@ -189,9 +189,6 @@ static struct usb_serial_driver handspring_device = { | |||
| 189 | .description = "Handspring Visor / Palm OS", | 189 | .description = "Handspring Visor / Palm OS", |
| 190 | .usb_driver = &visor_driver, | 190 | .usb_driver = &visor_driver, |
| 191 | .id_table = id_table, | 191 | .id_table = id_table, |
| 192 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 193 | .num_bulk_in = 2, | ||
| 194 | .num_bulk_out = NUM_DONT_CARE, | ||
| 195 | .num_ports = 2, | 192 | .num_ports = 2, |
| 196 | .open = visor_open, | 193 | .open = visor_open, |
| 197 | .close = visor_close, | 194 | .close = visor_close, |
| @@ -219,9 +216,6 @@ static struct usb_serial_driver clie_5_device = { | |||
| 219 | .description = "Sony Clie 5.0", | 216 | .description = "Sony Clie 5.0", |
| 220 | .usb_driver = &visor_driver, | 217 | .usb_driver = &visor_driver, |
| 221 | .id_table = clie_id_5_table, | 218 | .id_table = clie_id_5_table, |
| 222 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 223 | .num_bulk_in = 2, | ||
| 224 | .num_bulk_out = 2, | ||
| 225 | .num_ports = 2, | 219 | .num_ports = 2, |
| 226 | .open = visor_open, | 220 | .open = visor_open, |
| 227 | .close = visor_close, | 221 | .close = visor_close, |
| @@ -249,9 +243,6 @@ static struct usb_serial_driver clie_3_5_device = { | |||
| 249 | .description = "Sony Clie 3.5", | 243 | .description = "Sony Clie 3.5", |
| 250 | .usb_driver = &visor_driver, | 244 | .usb_driver = &visor_driver, |
| 251 | .id_table = clie_id_3_5_table, | 245 | .id_table = clie_id_3_5_table, |
| 252 | .num_interrupt_in = 0, | ||
| 253 | .num_bulk_in = 1, | ||
| 254 | .num_bulk_out = 1, | ||
| 255 | .num_ports = 1, | 246 | .num_ports = 1, |
| 256 | .open = visor_open, | 247 | .open = visor_open, |
| 257 | .close = visor_close, | 248 | .close = visor_close, |
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c index 38726ef3132..c5af57be62f 100644 --- a/drivers/usb/serial/whiteheat.c +++ b/drivers/usb/serial/whiteheat.c | |||
| @@ -164,9 +164,6 @@ static struct usb_serial_driver whiteheat_fake_device = { | |||
| 164 | .description = "Connect Tech - WhiteHEAT - (prerenumeration)", | 164 | .description = "Connect Tech - WhiteHEAT - (prerenumeration)", |
| 165 | .usb_driver = &whiteheat_driver, | 165 | .usb_driver = &whiteheat_driver, |
| 166 | .id_table = id_table_prerenumeration, | 166 | .id_table = id_table_prerenumeration, |
| 167 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 168 | .num_bulk_in = NUM_DONT_CARE, | ||
| 169 | .num_bulk_out = NUM_DONT_CARE, | ||
| 170 | .num_ports = 1, | 167 | .num_ports = 1, |
| 171 | .probe = whiteheat_firmware_download, | 168 | .probe = whiteheat_firmware_download, |
| 172 | .attach = whiteheat_firmware_attach, | 169 | .attach = whiteheat_firmware_attach, |
| @@ -180,9 +177,6 @@ static struct usb_serial_driver whiteheat_device = { | |||
| 180 | .description = "Connect Tech - WhiteHEAT", | 177 | .description = "Connect Tech - WhiteHEAT", |
| 181 | .usb_driver = &whiteheat_driver, | 178 | .usb_driver = &whiteheat_driver, |
| 182 | .id_table = id_table_std, | 179 | .id_table = id_table_std, |
| 183 | .num_interrupt_in = NUM_DONT_CARE, | ||
| 184 | .num_bulk_in = NUM_DONT_CARE, | ||
| 185 | .num_bulk_out = NUM_DONT_CARE, | ||
| 186 | .num_ports = 4, | 180 | .num_ports = 4, |
| 187 | .attach = whiteheat_attach, | 181 | .attach = whiteheat_attach, |
| 188 | .shutdown = whiteheat_shutdown, | 182 | .shutdown = whiteheat_shutdown, |
