UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: serial: remove unneeded number endpoints settings 

The usb-serial core no longer checks these fields so remove them from
all of the individual drivers.  They will be removed from the usb-serial
core in a patch later in the series.

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 5f760040bc
commit 0ba4034e20
39 changed files with 0 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/usb/serial/airprime.c
View File

@ -306,9 +306,6 @@ static struct usb_serial_driver airprime_device = {
}, },
.usb_driver = &airprime_driver, .usb_driver = &airprime_driver,
.id_table = id_table, .id_table = id_table,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.open = airprime_open, .open = airprime_open,
.close = airprime_close, .close = airprime_close,
.write = airprime_write, .write = airprime_write,

3
drivers/usb/serial/ark3116.c
View File

@ -447,9 +447,6 @@ static struct usb_serial_driver ark3116_device = {
}, },
.id_table = id_table, .id_table = id_table,
.usb_driver = &ark3116_driver, .usb_driver = &ark3116_driver,
.num_interrupt_in = 1,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.attach = ark3116_attach, .attach = ark3116_attach,
.set_termios = ark3116_set_termios, .set_termios = ark3116_set_termios,

3
drivers/usb/serial/belkin_sa.c
View File

@ -128,9 +128,6 @@ static struct usb_serial_driver belkin_device = {
.description = "Belkin / Peracom / GoHubs USB Serial Adapter", .description = "Belkin / Peracom / GoHubs USB Serial Adapter",
.usb_driver = &belkin_driver, .usb_driver = &belkin_driver,
.id_table = id_table_combined, .id_table = id_table_combined,
.num_interrupt_in = 1,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.open = belkin_sa_open, .open = belkin_sa_open,
.close = belkin_sa_close, .close = belkin_sa_close,

3
drivers/usb/serial/ch341.c
View File

@ -318,9 +318,6 @@ static struct usb_serial_driver ch341_device = {
}, },
.id_table = id_table, .id_table = id_table,
.usb_driver = &ch341_driver, .usb_driver = &ch341_driver,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.open = ch341_open, .open = ch341_open,
.set_termios = ch341_set_termios, .set_termios = ch341_set_termios,

3
drivers/usb/serial/cp2101.c
View File

@ -109,9 +109,6 @@ static struct usb_serial_driver cp2101_device = {
}, },
.usb_driver = &cp2101_driver, .usb_driver = &cp2101_driver,
.id_table = id_table, .id_table = id_table,
.num_interrupt_in = 0,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 1, .num_ports = 1,
.open = cp2101_open, .open = cp2101_open,
.close = cp2101_close, .close = cp2101_close,

3
drivers/usb/serial/cyberjack.c
View File

@ -90,9 +90,6 @@ static struct usb_serial_driver cyberjack_device = {
.description = "Reiner SCT Cyberjack USB card reader", .description = "Reiner SCT Cyberjack USB card reader",
.usb_driver = &cyberjack_driver, .usb_driver = &cyberjack_driver,
.id_table = id_table, .id_table = id_table,
.num_interrupt_in = 1,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.attach = cyberjack_startup, .attach = cyberjack_startup,
.shutdown = cyberjack_shutdown, .shutdown = cyberjack_shutdown,

12
drivers/usb/serial/cypress_m8.c
View File

@ -200,10 +200,6 @@ static struct usb_serial_driver cypress_earthmate_device = {
.description = "DeLorme Earthmate USB", .description = "DeLorme Earthmate USB",
.usb_driver = &cypress_driver, .usb_driver = &cypress_driver,
.id_table = id_table_earthmate, .id_table = id_table_earthmate,
.num_interrupt_in = 1,
.num_interrupt_out = 1,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 1, .num_ports = 1,
.attach = cypress_earthmate_startup, .attach = cypress_earthmate_startup,
.shutdown = cypress_shutdown, .shutdown = cypress_shutdown,
@ -230,10 +226,6 @@ static struct usb_serial_driver cypress_hidcom_device = {
.description = "HID->COM RS232 Adapter", .description = "HID->COM RS232 Adapter",
.usb_driver = &cypress_driver, .usb_driver = &cypress_driver,
.id_table = id_table_cyphidcomrs232, .id_table = id_table_cyphidcomrs232,
.num_interrupt_in = 1,
.num_interrupt_out = 1,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 1, .num_ports = 1,
.attach = cypress_hidcom_startup, .attach = cypress_hidcom_startup,
.shutdown = cypress_shutdown, .shutdown = cypress_shutdown,
@ -260,10 +252,6 @@ static struct usb_serial_driver cypress_ca42v2_device = {
.description = "Nokia CA-42 V2 Adapter", .description = "Nokia CA-42 V2 Adapter",
.usb_driver = &cypress_driver, .usb_driver = &cypress_driver,
.id_table = id_table_nokiaca42v2, .id_table = id_table_nokiaca42v2,
.num_interrupt_in = 1,
.num_interrupt_out = 1,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 1, .num_ports = 1,
.attach = cypress_ca42v2_startup, .attach = cypress_ca42v2_startup,
.shutdown = cypress_shutdown, .shutdown = cypress_shutdown,

6
drivers/usb/serial/digi_acceleport.c
View File

@ -508,9 +508,6 @@ static struct usb_serial_driver digi_acceleport_2_device = {
.description = "Digi 2 port USB adapter", .description = "Digi 2 port USB adapter",
.usb_driver = &digi_driver, .usb_driver = &digi_driver,
.id_table = id_table_2, .id_table = id_table_2,
.num_interrupt_in = 0,
.num_bulk_in = 4,
.num_bulk_out = 4,
.num_ports = 3, .num_ports = 3,
.open = digi_open, .open = digi_open,
.close = digi_close, .close = digi_close,
@ -538,9 +535,6 @@ static struct usb_serial_driver digi_acceleport_4_device = {
.description = "Digi 4 port USB adapter", .description = "Digi 4 port USB adapter",
.usb_driver = &digi_driver, .usb_driver = &digi_driver,
.id_table = id_table_4, .id_table = id_table_4,
.num_interrupt_in = 0,
.num_bulk_in = 5,
.num_bulk_out = 5,
.num_ports = 4, .num_ports = 4,
.open = digi_open, .open = digi_open,
.close = digi_close, .close = digi_close,

3
drivers/usb/serial/empeg.c
View File

@ -118,9 +118,6 @@ static struct usb_serial_driver empeg_device = {
}, },
.id_table = id_table, .id_table = id_table,
.usb_driver = &empeg_driver, .usb_driver = &empeg_driver,
.num_interrupt_in = 0,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.open = empeg_open, .open = empeg_open,
.close = empeg_close, .close = empeg_close,

3
drivers/usb/serial/ftdi_sio.c
View File

@ -439,9 +439,6 @@ static struct usb_serial_driver ftdi_sio_device = {
.description = "FTDI USB Serial Device", .description = "FTDI USB Serial Device",
.usb_driver = &ftdi_driver , .usb_driver = &ftdi_driver ,
.id_table = id_table_combined, .id_table = id_table_combined,
.num_interrupt_in = 0,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.probe = ftdi_sio_probe, .probe = ftdi_sio_probe,
.port_probe = ftdi_sio_port_probe, .port_probe = ftdi_sio_port_probe,

3
drivers/usb/serial/funsoft.c
View File

@ -39,9 +39,6 @@ static struct usb_serial_driver funsoft_device = {
}, },
.id_table = id_table, .id_table = id_table,
.usb_driver = &funsoft_driver, .usb_driver = &funsoft_driver,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 1, .num_ports = 1,
}; };

3
drivers/usb/serial/garmin_gps.c
View File

@ -1579,9 +1579,6 @@ static struct usb_serial_driver garmin_device = {
.description = "Garmin GPS usb/tty", .description = "Garmin GPS usb/tty",
.usb_driver = &garmin_driver, .usb_driver = &garmin_driver,
.id_table = id_table, .id_table = id_table,
.num_interrupt_in = 1,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.open = garmin_open, .open = garmin_open,
.close = garmin_close, .close = garmin_close,

3
drivers/usb/serial/generic.c
View File

@ -62,9 +62,6 @@ struct usb_serial_driver usb_serial_generic_device = {
}, },
.id_table = generic_device_ids, .id_table = generic_device_ids,
.usb_driver = &generic_driver, .usb_driver = &generic_driver,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 1, .num_ports = 1,
.shutdown = usb_serial_generic_shutdown, .shutdown = usb_serial_generic_shutdown,
.throttle = usb_serial_generic_throttle, .throttle = usb_serial_generic_throttle,

3
drivers/usb/serial/hp4x.c
View File

@ -50,9 +50,6 @@ static struct usb_serial_driver hp49gp_device = {
}, },
.id_table = id_table, .id_table = id_table,
.usb_driver = &hp49gp_driver, .usb_driver = &hp49gp_driver,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 1, .num_ports = 1,
}; };

12
drivers/usb/serial/io_tables.h
View File

@ -111,9 +111,6 @@ static struct usb_serial_driver edgeport_2port_device = {
.description = "Edgeport 2 port adapter", .description = "Edgeport 2 port adapter",
.usb_driver = &io_driver, .usb_driver = &io_driver,
.id_table = edgeport_2port_id_table, .id_table = edgeport_2port_id_table,
.num_interrupt_in = 1,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 2, .num_ports = 2,
.open = edge_open, .open = edge_open,
.close = edge_close, .close = edge_close,
@ -142,9 +139,6 @@ static struct usb_serial_driver edgeport_4port_device = {
.description = "Edgeport 4 port adapter", .description = "Edgeport 4 port adapter",
.usb_driver = &io_driver, .usb_driver = &io_driver,
.id_table = edgeport_4port_id_table, .id_table = edgeport_4port_id_table,
.num_interrupt_in = 1,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 4, .num_ports = 4,
.open = edge_open, .open = edge_open,
.close = edge_close, .close = edge_close,
@ -173,9 +167,6 @@ static struct usb_serial_driver edgeport_8port_device = {
.description = "Edgeport 8 port adapter", .description = "Edgeport 8 port adapter",
.usb_driver = &io_driver, .usb_driver = &io_driver,
.id_table = edgeport_8port_id_table, .id_table = edgeport_8port_id_table,
.num_interrupt_in = 1,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 8, .num_ports = 8,
.open = edge_open, .open = edge_open,
.close = edge_close, .close = edge_close,
@ -203,9 +194,6 @@ static struct usb_serial_driver epic_device = {
}, },
.description = "EPiC device", .description = "EPiC device",
.id_table = Epic_port_id_table, .id_table = Epic_port_id_table,
.num_interrupt_in = 1,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.open = edge_open, .open = edge_open,
.close = edge_close, .close = edge_close,

6
drivers/usb/serial/io_ti.c
View File

@ -3032,9 +3032,6 @@ static struct usb_serial_driver edgeport_1port_device = {
.description = "Edgeport TI 1 port adapter", .description = "Edgeport TI 1 port adapter",
.usb_driver = &io_driver, .usb_driver = &io_driver,
.id_table = edgeport_1port_id_table, .id_table = edgeport_1port_id_table,
.num_interrupt_in = 1,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.open = edge_open, .open = edge_open,
.close = edge_close, .close = edge_close,
@ -3064,9 +3061,6 @@ static struct usb_serial_driver edgeport_2port_device = {
.description = "Edgeport TI 2 port adapter", .description = "Edgeport TI 2 port adapter",
.usb_driver = &io_driver, .usb_driver = &io_driver,
.id_table = edgeport_2port_id_table, .id_table = edgeport_2port_id_table,
.num_interrupt_in = 1,
.num_bulk_in = 2,
.num_bulk_out = 2,
.num_ports = 2, .num_ports = 2,
.open = edge_open, .open = edge_open,
.close = edge_close, .close = edge_close,

3
drivers/usb/serial/ipaq.c
View File

@ -570,9 +570,6 @@ static struct usb_serial_driver ipaq_device = {
.description = "PocketPC PDA", .description = "PocketPC PDA",
.usb_driver = &ipaq_driver, .usb_driver = &ipaq_driver,
.id_table = ipaq_id_table, .id_table = ipaq_id_table,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 2, .num_ports = 2,
.open = ipaq_open, .open = ipaq_open,
.close = ipaq_close, .close = ipaq_close,

3
drivers/usb/serial/ipw.c
View File

@ -448,9 +448,6 @@ static struct usb_serial_driver ipw_device = {
.description = "IPWireless converter", .description = "IPWireless converter",
.usb_driver = &usb_ipw_driver, .usb_driver = &usb_ipw_driver,
.id_table = usb_ipw_ids, .id_table = usb_ipw_ids,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.open = ipw_open, .open = ipw_open,
.close = ipw_close, .close = ipw_close,

3
drivers/usb/serial/ir-usb.c
View File

@ -145,9 +145,6 @@ static struct usb_serial_driver ir_device = {
.description = "IR Dongle", .description = "IR Dongle",
.usb_driver = &ir_driver, .usb_driver = &ir_driver,
.id_table = id_table, .id_table = id_table,
.num_interrupt_in = 1,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.set_termios = ir_set_termios, .set_termios = ir_set_termios,
.attach = ir_startup, .attach = ir_startup,

3
drivers/usb/serial/iuu_phoenix.c
View File

@ -1162,9 +1162,6 @@ static struct usb_serial_driver iuu_device = {
.name = "iuu_phoenix", .name = "iuu_phoenix",
}, },
.id_table = id_table, .id_table = id_table,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.open = iuu_open, .open = iuu_open,
.close = iuu_close, .close = iuu_close,

16
drivers/usb/serial/keyspan.h
View File

@ -636,10 +636,6 @@ static struct usb_serial_driver keyspan_pre_device = {
}, },
.description = "Keyspan - (without firmware)", .description = "Keyspan - (without firmware)",
.id_table = keyspan_pre_ids, .id_table = keyspan_pre_ids,
.num_interrupt_in = NUM_DONT_CARE,
.num_interrupt_out = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 1, .num_ports = 1,
.attach = keyspan_fake_startup, .attach = keyspan_fake_startup,
}; };
@ -651,10 +647,6 @@ static struct usb_serial_driver keyspan_1port_device = {
}, },
.description = "Keyspan 1 port adapter", .description = "Keyspan 1 port adapter",
.id_table = keyspan_1port_ids, .id_table = keyspan_1port_ids,
.num_interrupt_in = NUM_DONT_CARE,
.num_interrupt_out = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 1, .num_ports = 1,
.open = keyspan_open, .open = keyspan_open,
.close = keyspan_close, .close = keyspan_close,
@ -679,10 +671,6 @@ static struct usb_serial_driver keyspan_2port_device = {
}, },
.description = "Keyspan 2 port adapter", .description = "Keyspan 2 port adapter",
.id_table = keyspan_2port_ids, .id_table = keyspan_2port_ids,
.num_interrupt_in = NUM_DONT_CARE,
.num_interrupt_out = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 2, .num_ports = 2,
.open = keyspan_open, .open = keyspan_open,
.close = keyspan_close, .close = keyspan_close,
@ -707,10 +695,6 @@ static struct usb_serial_driver keyspan_4port_device = {
}, },
.description = "Keyspan 4 port adapter", .description = "Keyspan 4 port adapter",
.id_table = keyspan_4port_ids, .id_table = keyspan_4port_ids,
.num_interrupt_in = NUM_DONT_CARE,
.num_interrupt_out = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 4, .num_ports = 4,
.open = keyspan_open, .open = keyspan_open,
.close = keyspan_close, .close = keyspan_close,

9
drivers/usb/serial/keyspan_pda.c
View File

@ -793,9 +793,6 @@ static struct usb_serial_driver keyspan_pda_fake_device = {
.description = "Keyspan PDA - (prerenumeration)", .description = "Keyspan PDA - (prerenumeration)",
.usb_driver = &keyspan_pda_driver, .usb_driver = &keyspan_pda_driver,
.id_table = id_table_fake, .id_table = id_table_fake,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 1, .num_ports = 1,
.attach = keyspan_pda_fake_startup, .attach = keyspan_pda_fake_startup,
}; };
@ -810,9 +807,6 @@ static struct usb_serial_driver xircom_pgs_fake_device = {
.description = "Xircom / Entregra PGS - (prerenumeration)", .description = "Xircom / Entregra PGS - (prerenumeration)",
.usb_driver = &keyspan_pda_driver, .usb_driver = &keyspan_pda_driver,
.id_table = id_table_fake_xircom, .id_table = id_table_fake_xircom,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 1, .num_ports = 1,
.attach = keyspan_pda_fake_startup, .attach = keyspan_pda_fake_startup,
}; };
@ -826,9 +820,6 @@ static struct usb_serial_driver keyspan_pda_device = {
.description = "Keyspan PDA", .description = "Keyspan PDA",
.usb_driver = &keyspan_pda_driver, .usb_driver = &keyspan_pda_driver,
.id_table = id_table_std, .id_table = id_table_std,
.num_interrupt_in = 1,
.num_bulk_in = 0,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.open = keyspan_pda_open, .open = keyspan_pda_open,
.close = keyspan_pda_close, .close = keyspan_pda_close,

3
drivers/usb/serial/kl5kusb105.c
View File

@ -126,9 +126,6 @@ static struct usb_serial_driver kl5kusb105d_device = {
.description = "KL5KUSB105D / PalmConnect", .description = "KL5KUSB105D / PalmConnect",
.usb_driver = &kl5kusb105d_driver, .usb_driver = &kl5kusb105d_driver,
.id_table = id_table, .id_table = id_table,
.num_interrupt_in = 1,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.open = klsi_105_open, .open = klsi_105_open,
.close = klsi_105_close, .close = klsi_105_close,

4
drivers/usb/serial/kobil_sct.c
View File

@ -113,10 +113,6 @@ static struct usb_serial_driver kobil_device = {
.description = "KOBIL USB smart card terminal", .description = "KOBIL USB smart card terminal",
.usb_driver = &kobil_driver, .usb_driver = &kobil_driver,
.id_table = id_table, .id_table = id_table,
.num_interrupt_in = NUM_DONT_CARE,
.num_interrupt_out = NUM_DONT_CARE,
.num_bulk_in = 0,
.num_bulk_out = 0,
.num_ports = 1, .num_ports = 1,
.attach = kobil_startup, .attach = kobil_startup,
.shutdown = kobil_shutdown, .shutdown = kobil_shutdown,

3
drivers/usb/serial/mct_u232.c
View File

@ -143,9 +143,6 @@ static struct usb_serial_driver mct_u232_device = {
.description = "MCT U232", .description = "MCT U232",
.usb_driver = &mct_u232_driver, .usb_driver = &mct_u232_driver,
.id_table = id_table_combined, .id_table = id_table_combined,
.num_interrupt_in = 2,
.num_bulk_in = 0,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.open = mct_u232_open, .open = mct_u232_open,
.close = mct_u232_close, .close = mct_u232_close,

3
drivers/usb/serial/mos7720.c
View File

@ -1596,9 +1596,6 @@ static struct usb_serial_driver moschip7720_2port_driver = {
.description = "Moschip 2 port adapter", .description = "Moschip 2 port adapter",
.usb_driver = &usb_driver, .usb_driver = &usb_driver,
.id_table = moschip_port_id_table, .id_table = moschip_port_id_table,
.num_interrupt_in = 1,
.num_bulk_in = 2,
.num_bulk_out = 2,
.num_ports = 2, .num_ports = 2,
.open = mos7720_open, .open = mos7720_open,
.close = mos7720_close, .close = mos7720_close,

5
drivers/usb/serial/mos7840.c
View File

@ -2800,12 +2800,7 @@ static struct usb_serial_driver moschip7840_4port_device = {
.description = DRIVER_DESC, .description = DRIVER_DESC,
.usb_driver = &io_driver, .usb_driver = &io_driver,
.id_table = moschip_port_id_table, .id_table = moschip_port_id_table,
.num_interrupt_in = 1, //NUM_DONT_CARE,//1,
#ifdef check
.num_bulk_in = 4,
.num_bulk_out = 4,
.num_ports = 4, .num_ports = 4,
#endif
.open = mos7840_open, .open = mos7840_open,
.close = mos7840_close, .close = mos7840_close,
.write = mos7840_write, .write = mos7840_write,

3
drivers/usb/serial/navman.c
View File

@ -121,9 +121,6 @@ static struct usb_serial_driver navman_device = {
}, },
.id_table = id_table, .id_table = id_table,
.usb_driver = &navman_driver, .usb_driver = &navman_driver,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 1, .num_ports = 1,
.open = navman_open, .open = navman_open,
.close = navman_close, .close = navman_close,

3
drivers/usb/serial/omninet.c
View File

@ -95,9 +95,6 @@ static struct usb_serial_driver zyxel_omninet_device = {
.description = "ZyXEL - omni.net lcd plus usb", .description = "ZyXEL - omni.net lcd plus usb",
.usb_driver = &omninet_driver, .usb_driver = &omninet_driver,
.id_table = id_table, .id_table = id_table,
.num_interrupt_in = 1,
.num_bulk_in = 1,
.num_bulk_out = 2,
.num_ports = 1, .num_ports = 1,
.attach = omninet_attach, .attach = omninet_attach,
.open = omninet_open, .open = omninet_open,

3
drivers/usb/serial/option.c
View File

@ -325,9 +325,6 @@ static struct usb_serial_driver option_1port_device = {
.description = "GSM modem (1-port)", .description = "GSM modem (1-port)",
.usb_driver = &option_driver, .usb_driver = &option_driver,
.id_table = option_ids, .id_table = option_ids,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 1, .num_ports = 1,
.open = option_open, .open = option_open,
.close = option_close, .close = option_close,

3
drivers/usb/serial/oti6858.c
View File

@ -179,9 +179,6 @@ static struct usb_serial_driver oti6858_device = {
.name = "oti6858", .name = "oti6858",
}, },
.id_table = id_table, .id_table = id_table,
.num_interrupt_in = 1,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.open = oti6858_open, .open = oti6858_open,
.close = oti6858_close, .close = oti6858_close,

3
drivers/usb/serial/pl2303.c
View File

@ -1114,9 +1114,6 @@ static struct usb_serial_driver pl2303_device = {
}, },
.id_table = id_table, .id_table = id_table,
.usb_driver = &pl2303_driver, .usb_driver = &pl2303_driver,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.open = pl2303_open, .open = pl2303_open,
.close = pl2303_close, .close = pl2303_close,

3
drivers/usb/serial/safe_serial.c
View File

@ -394,9 +394,6 @@ static struct usb_serial_driver safe_device = {
}, },
.id_table = id_table, .id_table = id_table,
.usb_driver = &safe_driver, .usb_driver = &safe_driver,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 1, .num_ports = 1,
.write = safe_write, .write = safe_write,
.write_room = safe_write_room, .write_room = safe_write_room,

3
drivers/usb/serial/sierra.c
View File

@ -746,9 +746,6 @@ static struct usb_serial_driver sierra_device = {
.description = "Sierra USB modem", .description = "Sierra USB modem",
.id_table = id_table, .id_table = id_table,
.usb_driver = &sierra_driver, .usb_driver = &sierra_driver,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.calc_num_ports = sierra_calc_num_ports, .calc_num_ports = sierra_calc_num_ports,
.probe = sierra_probe, .probe = sierra_probe,
.open = sierra_open, .open = sierra_open,

3
drivers/usb/serial/spcp8x5.c
View File

@ -1022,9 +1022,6 @@ static struct usb_serial_driver spcp8x5_device = {
.name = "SPCP8x5", .name = "SPCP8x5",
}, },
.id_table = id_table, .id_table = id_table,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.open = spcp8x5_open, .open = spcp8x5_open,
.close = spcp8x5_close, .close = spcp8x5_close,

6
drivers/usb/serial/ti_usb_3410_5052.c
View File

@ -264,9 +264,6 @@ static struct usb_serial_driver ti_1port_device = {
.description = "TI USB 3410 1 port adapter", .description = "TI USB 3410 1 port adapter",
.usb_driver = &ti_usb_driver, .usb_driver = &ti_usb_driver,
.id_table = ti_id_table_3410, .id_table = ti_id_table_3410,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.attach = ti_startup, .attach = ti_startup,
.shutdown = ti_shutdown, .shutdown = ti_shutdown,
@ -295,9 +292,6 @@ static struct usb_serial_driver ti_2port_device = {
.description = "TI USB 5052 2 port adapter", .description = "TI USB 5052 2 port adapter",
.usb_driver = &ti_usb_driver, .usb_driver = &ti_usb_driver,
.id_table = ti_id_table_5052, .id_table = ti_id_table_5052,
.num_interrupt_in = 1,
.num_bulk_in = 2,
.num_bulk_out = 2,
.num_ports = 2, .num_ports = 2,
.attach = ti_startup, .attach = ti_startup,
.shutdown = ti_shutdown, .shutdown = ti_shutdown,

3
drivers/usb/serial/usb_debug.c
View File

@ -35,9 +35,6 @@ static struct usb_serial_driver debug_device = {
.name = "debug", .name = "debug",
}, },
.id_table = id_table, .id_table = id_table,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 1, .num_ports = 1,
}; };

9
drivers/usb/serial/visor.c
View File

@ -189,9 +189,6 @@ static struct usb_serial_driver handspring_device = {
.description = "Handspring Visor / Palm OS", .description = "Handspring Visor / Palm OS",
.usb_driver = &visor_driver, .usb_driver = &visor_driver,
.id_table = id_table, .id_table = id_table,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = 2,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 2, .num_ports = 2,
.open = visor_open, .open = visor_open,
.close = visor_close, .close = visor_close,
@ -219,9 +216,6 @@ static struct usb_serial_driver clie_5_device = {
.description = "Sony Clie 5.0", .description = "Sony Clie 5.0",
.usb_driver = &visor_driver, .usb_driver = &visor_driver,
.id_table = clie_id_5_table, .id_table = clie_id_5_table,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = 2,
.num_bulk_out = 2,
.num_ports = 2, .num_ports = 2,
.open = visor_open, .open = visor_open,
.close = visor_close, .close = visor_close,
@ -249,9 +243,6 @@ static struct usb_serial_driver clie_3_5_device = {
.description = "Sony Clie 3.5", .description = "Sony Clie 3.5",
.usb_driver = &visor_driver, .usb_driver = &visor_driver,
.id_table = clie_id_3_5_table, .id_table = clie_id_3_5_table,
.num_interrupt_in = 0,
.num_bulk_in = 1,
.num_bulk_out = 1,
.num_ports = 1, .num_ports = 1,
.open = visor_open, .open = visor_open,
.close = visor_close, .close = visor_close,

6
drivers/usb/serial/whiteheat.c
View File

@ -164,9 +164,6 @@ static struct usb_serial_driver whiteheat_fake_device = {
.description = "Connect Tech - WhiteHEAT - (prerenumeration)", .description = "Connect Tech - WhiteHEAT - (prerenumeration)",
.usb_driver = &whiteheat_driver, .usb_driver = &whiteheat_driver,
.id_table = id_table_prerenumeration, .id_table = id_table_prerenumeration,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 1, .num_ports = 1,
.probe = whiteheat_firmware_download, .probe = whiteheat_firmware_download,
.attach = whiteheat_firmware_attach, .attach = whiteheat_firmware_attach,
@ -180,9 +177,6 @@ static struct usb_serial_driver whiteheat_device = {
.description = "Connect Tech - WhiteHEAT", .description = "Connect Tech - WhiteHEAT",
.usb_driver = &whiteheat_driver, .usb_driver = &whiteheat_driver,
.id_table = id_table_std, .id_table = id_table_std,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 4, .num_ports = 4,
.attach = whiteheat_attach, .attach = whiteheat_attach,
.shutdown = whiteheat_shutdown, .shutdown = whiteheat_shutdown,