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>

diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c
index f156dba0300f77168f7774199e988074bd249e8a..d5bcb37740348c2df670fb438e952db2c5499a1d 100644 (file)
--- a/drivers/usb/serial/airprime.c
+++ b/drivers/usb/serial/airprime.c
@@ -306,9 +306,6 @@ static struct usb_serial_driver airprime_device = {
        },
        .usb_driver =           &airprime_driver,
        .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,
        .close =                airprime_close,
        .write =                airprime_write,

diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
index fe2bfd67ba8e4717ef3b96657902663dbeedd22c..aa7a6838a3d42e7e4ac8957482087dcb9bb42d17 100644 (file)
--- a/drivers/usb/serial/ark3116.c
+++ b/drivers/usb/serial/ark3116.c
@@ -447,9 +447,6 @@ static struct usb_serial_driver ark3116_device = {
        },
        .id_table =             id_table,
        .usb_driver =           &ark3116_driver,
-       .num_interrupt_in =     1,
-       .num_bulk_in =          1,
-       .num_bulk_out =         1,
        .num_ports =            1,
        .attach =               ark3116_attach,
        .set_termios =          ark3116_set_termios,

diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index df0a2b3b02943e76d40a89f832c498eea0e964ca..b6950648804feaf580d819da91167706b3770801 100644 (file)
--- 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 = {
        .description =          "Belkin / Peracom / GoHubs USB Serial Adapter",
        .usb_driver =           &belkin_driver,
        .id_table =             id_table_combined,
-       .num_interrupt_in =     1,
-       .num_bulk_in =          1,
-       .num_bulk_out =         1,
        .num_ports =            1,
        .open =                 belkin_sa_open,
        .close =                belkin_sa_close,

diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index 42582d49b69c8951391e6a0a03c48f15d3756662..d947d955bceb9504d9beae2d9877ddb41c105e28 100644 (file)
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -318,9 +318,6 @@ static struct usb_serial_driver ch341_device = {
        },
        .id_table         = id_table,
        .usb_driver       = &ch341_driver,
-       .num_interrupt_in = NUM_DONT_CARE,
-       .num_bulk_in      = 1,
-       .num_bulk_out     = 1,
        .num_ports        = 1,
        .open             = ch341_open,
        .set_termios      = ch341_set_termios,

diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index 3b4fa94ecf2830b4abd8dd515c4dbd1252fc3ded..2af8d21bb1216f217491ed3a4eeca9343ed3282c 100644 (file)
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -109,9 +109,6 @@ static struct usb_serial_driver cp2101_device = {
        },
        .usb_driver             = &cp2101_driver,
        .id_table               = id_table,
-       .num_interrupt_in       = 0,
-       .num_bulk_in            = NUM_DONT_CARE,
-       .num_bulk_out           = NUM_DONT_CARE,
        .num_ports              = 1,
        .open                   = cp2101_open,
        .close                  = cp2101_close,

diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 8d9b045aa7e84b1e90f8f5431d088320466079b7..cbae876cd67868ef51a1cd27c7a56d7c8dd2416f 100644 (file)
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -90,9 +90,6 @@ static struct usb_serial_driver cyberjack_device = {
        .description =          "Reiner SCT Cyberjack USB card reader",
        .usb_driver =           &cyberjack_driver,
        .id_table =             id_table,
-       .num_interrupt_in =     1,
-       .num_bulk_in =          1,
-       .num_bulk_out =         1,
        .num_ports =            1,
        .attach =               cyberjack_startup,
        .shutdown =             cyberjack_shutdown,

diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 36f8ef0794791652179229ae33da02686450fedf..d8304eaf34c4c100508f2420aeb09b6d7ab3e7c0 100644 (file)
--- 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 = {
        .description =                  "DeLorme Earthmate USB",
        .usb_driver =                   &cypress_driver,
        .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,
        .attach =                       cypress_earthmate_startup,
        .shutdown =                     cypress_shutdown,
@@ -230,10 +226,6 @@ static struct usb_serial_driver cypress_hidcom_device = {
        .description =                  "HID->COM RS232 Adapter",
        .usb_driver =                   &cypress_driver,
        .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,
        .attach =                       cypress_hidcom_startup,
        .shutdown =                     cypress_shutdown,
@@ -260,10 +252,6 @@ static struct usb_serial_driver cypress_ca42v2_device = {
        .description =                  "Nokia CA-42 V2 Adapter",
        .usb_driver =                   &cypress_driver,
        .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,
        .attach =                       cypress_ca42v2_startup,
        .shutdown =                     cypress_shutdown,

diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index 5f9c6e46bee5712effaed0346d7ae5a31e305d60..4e3d5993a8e3ad6f23556b308bf655599711a105 100644 (file)
--- 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 = {
        .description =                  "Digi 2 port USB adapter",
        .usb_driver =                   &digi_driver,
        .id_table =                     id_table_2,
-       .num_interrupt_in =             0,
-       .num_bulk_in =                  4,
-       .num_bulk_out =                 4,
        .num_ports =                    3,
        .open =                         digi_open,
        .close =                        digi_close,
@@ -538,9 +535,6 @@ static struct usb_serial_driver digi_acceleport_4_device = {
        .description =                  "Digi 4 port USB adapter",
        .usb_driver =                   &digi_driver,
        .id_table =                     id_table_4,
-       .num_interrupt_in =             0,
-       .num_bulk_in =                  5,
-       .num_bulk_out =                 5,
        .num_ports =                    4,
        .open =                         digi_open,
        .close =                        digi_close,

diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index a5c8e1e17ea5ff42c0280b7e0b444e42694ac390..2cf8217711759a7fdf75da0d38520d147725dc74 100644 (file)
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -118,9 +118,6 @@ static struct usb_serial_driver empeg_device = {
        },
        .id_table =             id_table,
        .usb_driver =           &empeg_driver,
-       .num_interrupt_in =     0,
-       .num_bulk_in =          1,
-       .num_bulk_out =         1,
        .num_ports =            1,
        .open =                 empeg_open,
        .close =                empeg_close,

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 496c0c93ad8109deabd8c1423d6ccf0d9c098273..54b502f2924c84b8ec5042d129333128be52b911 100644 (file)
--- 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 = {
        .description =          "FTDI USB Serial Device",
        .usb_driver =           &ftdi_driver ,
        .id_table =             id_table_combined,
-       .num_interrupt_in =     0,
-       .num_bulk_in =          1,
-       .num_bulk_out =         1,
        .num_ports =            1,
        .probe =                ftdi_sio_probe,
        .port_probe =           ftdi_sio_port_probe,

diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c
index b5194dc7d3bba271e2066e539570e691f0fa0d93..e8ba2cb5995db1eefc0073607facf9ade1d15599 100644 (file)
--- a/drivers/usb/serial/funsoft.c
+++ b/drivers/usb/serial/funsoft.c
@@ -39,9 +39,6 @@ static struct usb_serial_driver funsoft_device = {
        },
        .id_table =             id_table,
        .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,
 };
 

diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index d74e43d69230b5ea1d7b75a4b599f9052f658004..87b77f92ae07c88b25481b6b6c8112680fe71e15 100644 (file)
--- 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 = {
        .description         = "Garmin GPS usb/tty",
        .usb_driver          = &garmin_driver,
        .id_table            = id_table,
-       .num_interrupt_in    = 1,
-       .num_bulk_in         = 1,
-       .num_bulk_out        = 1,
        .num_ports           = 1,
        .open                = garmin_open,
        .close               = garmin_close,

diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 7cfce9dabb9001c0f68bc68503c87e5bd07ed82a..5b0952054dec2c194d979892a575a14944ef0c37 100644 (file)
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -62,9 +62,6 @@ struct usb_serial_driver usb_serial_generic_device = {
        },
        .id_table =             generic_device_ids,
        .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,
        .shutdown =             usb_serial_generic_shutdown,
        .throttle =             usb_serial_generic_throttle,

diff --git a/drivers/usb/serial/hp4x.c b/drivers/usb/serial/hp4x.c
index 6c6ebae741c98573af1e8c9ee29f5a4344d263fb..75b88b356ebca4408f8f6e28c94d677856aeee4c 100644 (file)
--- a/drivers/usb/serial/hp4x.c
+++ b/drivers/usb/serial/hp4x.c
@@ -50,9 +50,6 @@ static struct usb_serial_driver hp49gp_device = {
        },
        .id_table =             id_table,
        .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,
 };
 

diff --git a/drivers/usb/serial/io_tables.h b/drivers/usb/serial/io_tables.h
index 6d3008772540fc2eccbda153930195a574216cf9..2ec85893f27abc8f8877d0fcfe23aad58db17dbd 100644 (file)
--- 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 = {
        .description            = "Edgeport 2 port adapter",
        .usb_driver             = &io_driver,
        .id_table               = edgeport_2port_id_table,
-       .num_interrupt_in       = 1,
-       .num_bulk_in            = 1,
-       .num_bulk_out           = 1,
        .num_ports              = 2,
        .open                   = edge_open,
        .close                  = edge_close,
@@ -142,9 +139,6 @@ static struct usb_serial_driver edgeport_4port_device = {
        .description            = "Edgeport 4 port adapter",
        .usb_driver             = &io_driver,
        .id_table               = edgeport_4port_id_table,
-       .num_interrupt_in       = 1,
-       .num_bulk_in            = 1,
-       .num_bulk_out           = 1,
        .num_ports              = 4,
        .open                   = edge_open,
        .close                  = edge_close,
@@ -173,9 +167,6 @@ static struct usb_serial_driver edgeport_8port_device = {
        .description            = "Edgeport 8 port adapter",
        .usb_driver             = &io_driver,
        .id_table               = edgeport_8port_id_table,
-       .num_interrupt_in       = 1,
-       .num_bulk_in            = 1,
-       .num_bulk_out           = 1,
        .num_ports              = 8,
        .open                   = edge_open,
        .close                  = edge_close,
@@ -203,9 +194,6 @@ static struct usb_serial_driver epic_device = {
        },
        .description            = "EPiC device",
        .id_table               = Epic_port_id_table,
-       .num_interrupt_in       = 1,
-       .num_bulk_in            = 1,
-       .num_bulk_out           = 1,
        .num_ports              = 1,
        .open                   = edge_open,
        .close                  = edge_close,

diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 316467ecd7788ba1a8d036f690c27444359078b9..856e4d9afd6f71e7a7766243e0e33a1d06b62de5 100644 (file)
--- 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 = {
        .description            = "Edgeport TI 1 port adapter",
        .usb_driver             = &io_driver,
        .id_table               = edgeport_1port_id_table,
-       .num_interrupt_in       = 1,
-       .num_bulk_in            = 1,
-       .num_bulk_out           = 1,
        .num_ports              = 1,
        .open                   = edge_open,
        .close                  = edge_close,
@@ -3064,9 +3061,6 @@ static struct usb_serial_driver edgeport_2port_device = {
        .description            = "Edgeport TI 2 port adapter",
        .usb_driver             = &io_driver,
        .id_table               = edgeport_2port_id_table,
-       .num_interrupt_in       = 1,
-       .num_bulk_in            = 2,
-       .num_bulk_out           = 2,
        .num_ports              = 2,
        .open                   = edge_open,
        .close                  = edge_close,

diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index 17f2a53b8ba437e63eeb3bfd3d40f25cb84fd983..1711dda0ea6d3c85b0524dc504061c84923b84e8 100644 (file)
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -570,9 +570,6 @@ static struct usb_serial_driver ipaq_device = {
        .description =          "PocketPC PDA",
        .usb_driver =           &ipaq_driver,
        .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,
        .open =                 ipaq_open,
        .close =                ipaq_close,

diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index cbe5530f3db2554bc40b99e2c357dd33e2567e2f..ec0ccd14e18e98d34d77fda8097c8f7098c7432b 100644 (file)
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -448,9 +448,6 @@ static struct usb_serial_driver ipw_device = {
        .description =          "IPWireless converter",
        .usb_driver =           &usb_ipw_driver,
        .id_table =             usb_ipw_ids,
-       .num_interrupt_in =     NUM_DONT_CARE,
-       .num_bulk_in =          1,
-       .num_bulk_out =         1,
        .num_ports =            1,
        .open =                 ipw_open,
        .close =                ipw_close,

diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index 6b803ab98543760d5669f13dced088dee87bb8d4..82e12f8d600a48e049bd25573f0db2952f165821 100644 (file)
--- 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 = {
        .description =          "IR Dongle",
        .usb_driver =           &ir_driver,
        .id_table =             id_table,
-       .num_interrupt_in =     1,
-       .num_bulk_in =          1,
-       .num_bulk_out =         1,
        .num_ports =            1,
        .set_termios =          ir_set_termios,
        .attach =               ir_startup,

diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index a09b9a85b16d33eaf6465efa928c0da5ff258039..7fee53441c24f14ff00e3968a8118fa05208a843 100644 (file)
--- 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 = {
                   .name = "iuu_phoenix",
                   },
        .id_table = id_table,
-       .num_interrupt_in = NUM_DONT_CARE,
-       .num_bulk_in = 1,
-       .num_bulk_out = 1,
        .num_ports = 1,
        .open = iuu_open,
        .close = iuu_close,

diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
index 74ce8bca3e668422af542a6b709b3e762bc42418..8d6ed0293bfac1f6900d3a5be86781a523f80298 100644 (file)
--- a/drivers/usb/serial/keyspan.h
+++ b/drivers/usb/serial/keyspan.h
@@ -636,10 +636,6 @@ static struct usb_serial_driver keyspan_pre_device = {
        },
        .description            = "Keyspan - (without firmware)",
        .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,
        .attach                 = keyspan_fake_startup,
 };
@@ -651,10 +647,6 @@ static struct usb_serial_driver keyspan_1port_device = {
        },
        .description            = "Keyspan 1 port adapter",
        .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,
        .open                   = keyspan_open,
        .close                  = keyspan_close,
@@ -679,10 +671,6 @@ static struct usb_serial_driver keyspan_2port_device = {
        },
        .description            = "Keyspan 2 port adapter",
        .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,
        .open                   = keyspan_open,
        .close                  = keyspan_close,
@@ -707,10 +695,6 @@ static struct usb_serial_driver keyspan_4port_device = {
        },
        .description            = "Keyspan 4 port adapter",
        .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,
        .open                   = keyspan_open,
        .close                  = keyspan_close,

diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index b1fa5a376e96798fc6871b6a47e93c7bed2378a9..0398477951850cad3072b0fb311ce93b1c6310a5 100644 (file)
--- 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 = {
        .description =          "Keyspan PDA - (prerenumeration)",
        .usb_driver =           &keyspan_pda_driver,
        .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,
        .attach =               keyspan_pda_fake_startup,
 };
@@ -810,9 +807,6 @@ static struct usb_serial_driver xircom_pgs_fake_device = {
        .description =          "Xircom / Entregra PGS - (prerenumeration)",
        .usb_driver =           &keyspan_pda_driver,
        .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,
        .attach =               keyspan_pda_fake_startup,
 };
@@ -826,9 +820,6 @@ static struct usb_serial_driver keyspan_pda_device = {
        .description =          "Keyspan PDA",
        .usb_driver =           &keyspan_pda_driver,
        .id_table =             id_table_std,
-       .num_interrupt_in =     1,
-       .num_bulk_in =          0,
-       .num_bulk_out =         1,
        .num_ports =            1,
        .open =                 keyspan_pda_open,
        .close =                keyspan_pda_close,

diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index 55736df7d2f4ed0232d2c33700d353a47336cafe..d71004283904f74090cd3c5294af261261a90a75 100644 (file)
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -126,9 +126,6 @@ static struct usb_serial_driver kl5kusb105d_device = {
        .description =       "KL5KUSB105D / PalmConnect",
        .usb_driver =        &kl5kusb105d_driver,
        .id_table =          id_table,
-       .num_interrupt_in =  1,
-       .num_bulk_in =       1,
-       .num_bulk_out =      1,
        .num_ports =         1,
        .open =              klsi_105_open,
        .close =             klsi_105_close,

diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index 03cb5dd8cbe3a497531eed9ad83113013ade695b..78458c807eac36baa355137a459de60cd2711701 100644 (file)
--- 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 = {
        .description =          "KOBIL USB smart card terminal",
        .usb_driver =           &kobil_driver,
        .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,
        .attach =               kobil_startup,
        .shutdown =             kobil_shutdown,

diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index fc1cea4aba13979ff48ea6fbdd371787fc1cea5e..b9e0fbacc8a4671a565d737c94d5cfdb0c4de760 100644 (file)
--- 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 = {
        .description =       "MCT U232",
        .usb_driver =        &mct_u232_driver,
        .id_table =          id_table_combined,
-       .num_interrupt_in =  2,
-       .num_bulk_in =       0,
-       .num_bulk_out =      1,
        .num_ports =         1,
        .open =              mct_u232_open,
        .close =             mct_u232_close,

diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 40f3a0188807d95c7e69a7a23001133678dbd9d1..2e14fdd08464c8b521e77eedb4d34c5aa03232f3 100644 (file)
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -1596,9 +1596,6 @@ static struct usb_serial_driver moschip7720_2port_driver = {
        .description            = "Moschip 2 port adapter",
        .usb_driver             = &usb_driver,
        .id_table               = moschip_port_id_table,
-       .num_interrupt_in       = 1,
-       .num_bulk_in            = 2,
-       .num_bulk_out           = 2,
        .num_ports              = 2,
        .open                   = mos7720_open,
        .close                  = mos7720_close,

diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 0b29c5383dc8800adb9a5684a63fea24195cfa23..37c4f0736bc1371abf2bf854e15ba9a884701b08 100644 (file)
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -2800,12 +2800,7 @@ static struct usb_serial_driver moschip7840_4port_device = {
        .description = DRIVER_DESC,
        .usb_driver = &io_driver,
        .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,
-#endif
        .open = mos7840_open,
        .close = mos7840_close,
        .write = mos7840_write,

diff --git a/drivers/usb/serial/navman.c b/drivers/usb/serial/navman.c
index 7f337c9aeb5fe9ba13c5c58dd2bf1b3f2c5e4052..ddaccbcde84d2f0f8b32700b18d391b9db4ebe5b 100644 (file)
--- a/drivers/usb/serial/navman.c
+++ b/drivers/usb/serial/navman.c
@@ -121,9 +121,6 @@ static struct usb_serial_driver navman_device = {
        },
        .id_table =             id_table,
        .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,
        .open =                 navman_open,
        .close =                navman_close,

diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index ee94d9616d82c8ff64869b58b46c56d08e5599aa..050511ff2b17e768d4b178ae8d394602f26b8023 100644 (file)
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -95,9 +95,6 @@ static struct usb_serial_driver zyxel_omninet_device = {
        .description =          "ZyXEL - omni.net lcd plus usb",
        .usb_driver =           &omninet_driver,
        .id_table =             id_table,
-       .num_interrupt_in =     1,
-       .num_bulk_in =          1,
-       .num_bulk_out =         2,
        .num_ports =            1,
        .attach =               omninet_attach,
        .open =                 omninet_open,

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 130aa96746f0f6ebc0e3d4b04b1bc287c50f4d7c..f4914209871db627a8674b3403836e4464542052 100644 (file)
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -325,9 +325,6 @@ static struct usb_serial_driver option_1port_device = {
        .description       = "GSM modem (1-port)",
        .usb_driver        = &option_driver,
        .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,
        .open              = option_open,
        .close             = option_close,

diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index 8acc907a31817d3fcf84d76b0a6ea3de48c6fae9..20a680ed0cc710284356f35225b2b40c5aaaceb7 100644 (file)
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -179,9 +179,6 @@ static struct usb_serial_driver oti6858_device = {
                .name =         "oti6858",
        },
        .id_table =             id_table,
-       .num_interrupt_in =     1,
-       .num_bulk_in =          1,
-       .num_bulk_out =         1,
        .num_ports =            1,
        .open =                 oti6858_open,
        .close =                oti6858_close,

diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 2af778555bdc85496e3a3f02c9d8f3f977cda72f..1fbb4dbdf23d7a98003c3a302ec8101f460134ad 100644 (file)
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -1114,9 +1114,6 @@ static struct usb_serial_driver pl2303_device = {
        },
        .id_table =             id_table,
        .usb_driver =           &pl2303_driver,
-       .num_interrupt_in =     NUM_DONT_CARE,
-       .num_bulk_in =          1,
-       .num_bulk_out =         1,
        .num_ports =            1,
        .open =                 pl2303_open,
        .close =                pl2303_close,

diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
index 4e6dcc199be9a3119800dcf82845858b64d41ad9..353c54fa0580e68685a1b997ceb9d8ef6ba76c14 100644 (file)
--- 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 = {
        },
        .id_table =             id_table,
        .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,
        .write =                safe_write,
        .write_room =           safe_write_room,

diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index f791eb8887fcd9ba522c32a5aa45692f9612d0eb..07eabaf9f0449312a66da0b493c098b3fd9322dc 100644 (file)
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -746,9 +746,6 @@ static struct usb_serial_driver sierra_device = {
        .description       = "Sierra USB modem",
        .id_table          = id_table,
        .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,
        .probe             = sierra_probe,
        .open              = sierra_open,

diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index 1b46b846f1007ec48e81dc3a5319266615a44c54..2282d620186e2122fadbb0bf1c9bbed1a52ac6f7 100644 (file)
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -1022,9 +1022,6 @@ static struct usb_serial_driver spcp8x5_device = {
                .name =         "SPCP8x5",
        },
        .id_table               = id_table,
-       .num_interrupt_in       = NUM_DONT_CARE,
-       .num_bulk_in            = 1,
-       .num_bulk_out           = 1,
        .num_ports              = 1,
        .open                   = spcp8x5_open,
        .close                  = spcp8x5_close,

diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 5b470f76e91b55f15e05b4b484a643a54785ee98..f3bbf777c81ae548974b602fe803aaa6e2ef7195 100644 (file)
--- 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 = {
        .description            = "TI USB 3410 1 port adapter",
        .usb_driver             = &ti_usb_driver,
        .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,
        .attach                 = ti_startup,
        .shutdown               = ti_shutdown,
@@ -295,9 +292,6 @@ static struct usb_serial_driver ti_2port_device = {
        .description            = "TI USB 5052 2 port adapter",
        .usb_driver             = &ti_usb_driver,
        .id_table               = ti_id_table_5052,
-       .num_interrupt_in       = 1,
-       .num_bulk_in            = 2,
-       .num_bulk_out           = 2,
        .num_ports              = 2,
        .attach                 = ti_startup,
        .shutdown               = ti_shutdown,

diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c
index 257a5e4368731ef66f88144399f46c96d57e7365..f9fc926b56d87896577280da6c7d8b39d6b10cc6 100644 (file)
--- 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 = {
                .name =         "debug",
        },
        .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,
 };
 

diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index c2b01f7c3197ad0f74ebac9f14b21d71c00d04f5..f2d59b06c3644a2b47cd8fca769cf0bbc9a584a6 100644 (file)
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -189,9 +189,6 @@ static struct usb_serial_driver handspring_device = {
        .description =          "Handspring Visor / Palm OS",
        .usb_driver =           &visor_driver,
        .id_table =             id_table,
-       .num_interrupt_in =     NUM_DONT_CARE,
-       .num_bulk_in =          2,
-       .num_bulk_out =         NUM_DONT_CARE,
        .num_ports =            2,
        .open =                 visor_open,
        .close =                visor_close,
@@ -219,9 +216,6 @@ static struct usb_serial_driver clie_5_device = {
        .description =          "Sony Clie 5.0",
        .usb_driver =           &visor_driver,
        .id_table =             clie_id_5_table,
-       .num_interrupt_in =     NUM_DONT_CARE,
-       .num_bulk_in =          2,
-       .num_bulk_out =         2,
        .num_ports =            2,
        .open =                 visor_open,
        .close =                visor_close,
@@ -249,9 +243,6 @@ static struct usb_serial_driver clie_3_5_device = {
        .description =          "Sony Clie 3.5",
        .usb_driver =           &visor_driver,
        .id_table =             clie_id_3_5_table,
-       .num_interrupt_in =     0,
-       .num_bulk_in =          1,
-       .num_bulk_out =         1,
        .num_ports =            1,
        .open =                 visor_open,
        .close =                visor_close,

diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 38726ef3132b70d83121d8bdaa894b47990f0843..c5af57be62f4fcd7532f718073d87d5d53e71f65 100644 (file)
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -164,9 +164,6 @@ static struct usb_serial_driver whiteheat_fake_device = {
        .description =          "Connect Tech - WhiteHEAT - (prerenumeration)",
        .usb_driver =           &whiteheat_driver,
        .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,
        .probe =                whiteheat_firmware_download,
        .attach =               whiteheat_firmware_attach,
@@ -180,9 +177,6 @@ static struct usb_serial_driver whiteheat_device = {
        .description =          "Connect Tech - WhiteHEAT",
        .usb_driver =           &whiteheat_driver,
        .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,
        .attach =               whiteheat_attach,
        .shutdown =             whiteheat_shutdown,