diff options
52 files changed, 1 insertions, 52 deletions
diff --git a/drivers/staging/quatech_usb2/quatech_usb2.c b/drivers/staging/quatech_usb2/quatech_usb2.c index 7739ada045e6..70147b9d2b52 100644 --- a/drivers/staging/quatech_usb2/quatech_usb2.c +++ b/drivers/staging/quatech_usb2/quatech_usb2.c | |||
@@ -132,7 +132,6 @@ MODULE_DEVICE_TABLE(usb, quausb2_id_table); | |||
132 | /* custom structures we need go here */ | 132 | /* custom structures we need go here */ |
133 | static struct usb_driver quausb2_usb_driver = { | 133 | static struct usb_driver quausb2_usb_driver = { |
134 | .name = "quatech-usb2-serial", | 134 | .name = "quatech-usb2-serial", |
135 | .probe = usb_serial_probe, | ||
136 | .disconnect = usb_serial_disconnect, | 135 | .disconnect = usb_serial_disconnect, |
137 | .id_table = quausb2_id_table, | 136 | .id_table = quausb2_id_table, |
138 | }; | 137 | }; |
diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c index b547b7b6eecb..d6e5e18332f4 100644 --- a/drivers/staging/serqt_usb2/serqt_usb2.c +++ b/drivers/staging/serqt_usb2/serqt_usb2.c | |||
@@ -197,7 +197,6 @@ struct quatech_port { | |||
197 | 197 | ||
198 | static struct usb_driver serqt_usb_driver = { | 198 | static struct usb_driver serqt_usb_driver = { |
199 | .name = "quatech-usb-serial", | 199 | .name = "quatech-usb-serial", |
200 | .probe = usb_serial_probe, | ||
201 | .disconnect = usb_serial_disconnect, | 200 | .disconnect = usb_serial_disconnect, |
202 | .id_table = serqt_id_table, | 201 | .id_table = serqt_id_table, |
203 | }; | 202 | }; |
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c index eec4fb9a35c1..ac69b82b1fe7 100644 --- a/drivers/usb/serial/aircable.c +++ b/drivers/usb/serial/aircable.c | |||
@@ -172,7 +172,6 @@ static void aircable_process_read_urb(struct urb *urb) | |||
172 | 172 | ||
173 | static struct usb_driver aircable_driver = { | 173 | static struct usb_driver aircable_driver = { |
174 | .name = "aircable", | 174 | .name = "aircable", |
175 | .probe = usb_serial_probe, | ||
176 | .disconnect = usb_serial_disconnect, | 175 | .disconnect = usb_serial_disconnect, |
177 | .id_table = id_table, | 176 | .id_table = id_table, |
178 | }; | 177 | }; |
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c index f99f47100dd8..33dc0e37ebb7 100644 --- a/drivers/usb/serial/ark3116.c +++ b/drivers/usb/serial/ark3116.c | |||
@@ -716,7 +716,6 @@ static void ark3116_process_read_urb(struct urb *urb) | |||
716 | 716 | ||
717 | static struct usb_driver ark3116_driver = { | 717 | static struct usb_driver ark3116_driver = { |
718 | .name = "ark3116", | 718 | .name = "ark3116", |
719 | .probe = usb_serial_probe, | ||
720 | .disconnect = usb_serial_disconnect, | 719 | .disconnect = usb_serial_disconnect, |
721 | .id_table = id_table, | 720 | .id_table = id_table, |
722 | }; | 721 | }; |
diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c index 20073856cd18..eb12616dbf6f 100644 --- a/drivers/usb/serial/belkin_sa.c +++ b/drivers/usb/serial/belkin_sa.c | |||
@@ -75,7 +75,6 @@ MODULE_DEVICE_TABLE(usb, id_table_combined); | |||
75 | 75 | ||
76 | static struct usb_driver belkin_driver = { | 76 | static struct usb_driver belkin_driver = { |
77 | .name = "belkin", | 77 | .name = "belkin", |
78 | .probe = usb_serial_probe, | ||
79 | .disconnect = usb_serial_disconnect, | 78 | .disconnect = usb_serial_disconnect, |
80 | .id_table = id_table_combined, | 79 | .id_table = id_table_combined, |
81 | }; | 80 | }; |
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index ba4f067cf277..83fd8e08ea53 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c | |||
@@ -597,7 +597,6 @@ static int ch341_reset_resume(struct usb_interface *intf) | |||
597 | 597 | ||
598 | static struct usb_driver ch341_driver = { | 598 | static struct usb_driver ch341_driver = { |
599 | .name = "ch341", | 599 | .name = "ch341", |
600 | .probe = usb_serial_probe, | ||
601 | .disconnect = usb_serial_disconnect, | 600 | .disconnect = usb_serial_disconnect, |
602 | .reset_resume = ch341_reset_resume, | 601 | .reset_resume = ch341_reset_resume, |
603 | .id_table = id_table, | 602 | .id_table = id_table, |
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index 81468c0f5e61..cbfc08dd67cd 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c | |||
@@ -158,7 +158,6 @@ struct cp210x_port_private { | |||
158 | 158 | ||
159 | static struct usb_driver cp210x_driver = { | 159 | static struct usb_driver cp210x_driver = { |
160 | .name = "cp210x", | 160 | .name = "cp210x", |
161 | .probe = usb_serial_probe, | ||
162 | .disconnect = usb_serial_disconnect, | 161 | .disconnect = usb_serial_disconnect, |
163 | .id_table = id_table, | 162 | .id_table = id_table, |
164 | }; | 163 | }; |
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c index 7b804fd397c9..5e765085fad0 100644 --- a/drivers/usb/serial/cyberjack.c +++ b/drivers/usb/serial/cyberjack.c | |||
@@ -79,7 +79,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
79 | 79 | ||
80 | static struct usb_driver cyberjack_driver = { | 80 | static struct usb_driver cyberjack_driver = { |
81 | .name = "cyberjack", | 81 | .name = "cyberjack", |
82 | .probe = usb_serial_probe, | ||
83 | .disconnect = usb_serial_disconnect, | 82 | .disconnect = usb_serial_disconnect, |
84 | .id_table = id_table, | 83 | .id_table = id_table, |
85 | }; | 84 | }; |
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index 6fac26c5fd53..14b64ba3eec0 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c | |||
@@ -91,7 +91,6 @@ MODULE_DEVICE_TABLE(usb, id_table_combined); | |||
91 | 91 | ||
92 | static struct usb_driver cypress_driver = { | 92 | static struct usb_driver cypress_driver = { |
93 | .name = "cypress", | 93 | .name = "cypress", |
94 | .probe = usb_serial_probe, | ||
95 | .disconnect = usb_serial_disconnect, | 94 | .disconnect = usb_serial_disconnect, |
96 | .id_table = id_table_combined, | 95 | .id_table = id_table_combined, |
97 | }; | 96 | }; |
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c index f8dad3a3427b..00abe81b5520 100644 --- a/drivers/usb/serial/digi_acceleport.c +++ b/drivers/usb/serial/digi_acceleport.c | |||
@@ -273,7 +273,6 @@ MODULE_DEVICE_TABLE(usb, id_table_combined); | |||
273 | 273 | ||
274 | static struct usb_driver digi_driver = { | 274 | static struct usb_driver digi_driver = { |
275 | .name = "digi_acceleport", | 275 | .name = "digi_acceleport", |
276 | .probe = usb_serial_probe, | ||
277 | .disconnect = usb_serial_disconnect, | 276 | .disconnect = usb_serial_disconnect, |
278 | .id_table = id_table_combined, | 277 | .id_table = id_table_combined, |
279 | }; | 278 | }; |
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c index 615e3803cfb9..cbef1a5d87a0 100644 --- a/drivers/usb/serial/empeg.c +++ b/drivers/usb/serial/empeg.c | |||
@@ -53,7 +53,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
53 | 53 | ||
54 | static struct usb_driver empeg_driver = { | 54 | static struct usb_driver empeg_driver = { |
55 | .name = "empeg", | 55 | .name = "empeg", |
56 | .probe = usb_serial_probe, | ||
57 | .disconnect = usb_serial_disconnect, | 56 | .disconnect = usb_serial_disconnect, |
58 | .id_table = id_table, | 57 | .id_table = id_table, |
59 | }; | 58 | }; |
diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index c32486d73a76..db65e7e9f8da 100644 --- a/drivers/usb/serial/f81232.c +++ b/drivers/usb/serial/f81232.c | |||
@@ -352,7 +352,6 @@ static void f81232_release(struct usb_serial *serial) | |||
352 | 352 | ||
353 | static struct usb_driver f81232_driver = { | 353 | static struct usb_driver f81232_driver = { |
354 | .name = "f81232", | 354 | .name = "f81232", |
355 | .probe = usb_serial_probe, | ||
356 | .disconnect = usb_serial_disconnect, | 355 | .disconnect = usb_serial_disconnect, |
357 | .id_table = id_table, | 356 | .id_table = id_table, |
358 | }; | 357 | }; |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 5691b8be0c77..40f9993b3796 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -863,7 +863,6 @@ MODULE_DEVICE_TABLE(usb, id_table_combined); | |||
863 | 863 | ||
864 | static struct usb_driver ftdi_driver = { | 864 | static struct usb_driver ftdi_driver = { |
865 | .name = "ftdi_sio", | 865 | .name = "ftdi_sio", |
866 | .probe = usb_serial_probe, | ||
867 | .disconnect = usb_serial_disconnect, | 866 | .disconnect = usb_serial_disconnect, |
868 | .id_table = id_table_combined, | 867 | .id_table = id_table_combined, |
869 | }; | 868 | }; |
diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c index 4577b3607922..168acbb54a0c 100644 --- a/drivers/usb/serial/funsoft.c +++ b/drivers/usb/serial/funsoft.c | |||
@@ -26,7 +26,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
26 | 26 | ||
27 | static struct usb_driver funsoft_driver = { | 27 | static struct usb_driver funsoft_driver = { |
28 | .name = "funsoft", | 28 | .name = "funsoft", |
29 | .probe = usb_serial_probe, | ||
30 | .disconnect = usb_serial_disconnect, | 29 | .disconnect = usb_serial_disconnect, |
31 | .id_table = id_table, | 30 | .id_table = id_table, |
32 | }; | 31 | }; |
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c index 52c079d02ca3..3a570597f587 100644 --- a/drivers/usb/serial/garmin_gps.c +++ b/drivers/usb/serial/garmin_gps.c | |||
@@ -221,7 +221,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
221 | 221 | ||
222 | static struct usb_driver garmin_driver = { | 222 | static struct usb_driver garmin_driver = { |
223 | .name = "garmin_gps", | 223 | .name = "garmin_gps", |
224 | .probe = usb_serial_probe, | ||
225 | .disconnect = usb_serial_disconnect, | 224 | .disconnect = usb_serial_disconnect, |
226 | .id_table = id_table, | 225 | .id_table = id_table, |
227 | }; | 226 | }; |
diff --git a/drivers/usb/serial/hp4x.c b/drivers/usb/serial/hp4x.c index 2563e788c9b3..d800ff308bd3 100644 --- a/drivers/usb/serial/hp4x.c +++ b/drivers/usb/serial/hp4x.c | |||
@@ -38,7 +38,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
38 | 38 | ||
39 | static struct usb_driver hp49gp_driver = { | 39 | static struct usb_driver hp49gp_driver = { |
40 | .name = "hp4X", | 40 | .name = "hp4X", |
41 | .probe = usb_serial_probe, | ||
42 | .disconnect = usb_serial_disconnect, | 41 | .disconnect = usb_serial_disconnect, |
43 | .id_table = id_table, | 42 | .id_table = id_table, |
44 | }; | 43 | }; |
diff --git a/drivers/usb/serial/io_tables.h b/drivers/usb/serial/io_tables.h index d0e7c9affb6f..7498b5e6a039 100644 --- a/drivers/usb/serial/io_tables.h +++ b/drivers/usb/serial/io_tables.h | |||
@@ -97,7 +97,6 @@ MODULE_DEVICE_TABLE(usb, id_table_combined); | |||
97 | 97 | ||
98 | static struct usb_driver io_driver = { | 98 | static struct usb_driver io_driver = { |
99 | .name = "io_edgeport", | 99 | .name = "io_edgeport", |
100 | .probe = usb_serial_probe, | ||
101 | .disconnect = usb_serial_disconnect, | 100 | .disconnect = usb_serial_disconnect, |
102 | .id_table = id_table_combined, | 101 | .id_table = id_table_combined, |
103 | }; | 102 | }; |
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index 5e4b47194819..88ab9f6be1ed 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c | |||
@@ -199,7 +199,6 @@ MODULE_DEVICE_TABLE(usb, id_table_combined); | |||
199 | 199 | ||
200 | static struct usb_driver io_driver = { | 200 | static struct usb_driver io_driver = { |
201 | .name = "io_ti", | 201 | .name = "io_ti", |
202 | .probe = usb_serial_probe, | ||
203 | .disconnect = usb_serial_disconnect, | 202 | .disconnect = usb_serial_disconnect, |
204 | .id_table = id_table_combined, | 203 | .id_table = id_table_combined, |
205 | }; | 204 | }; |
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c index 65b689a4e36f..340c39e330b0 100644 --- a/drivers/usb/serial/ipaq.c +++ b/drivers/usb/serial/ipaq.c | |||
@@ -504,7 +504,6 @@ MODULE_DEVICE_TABLE(usb, ipaq_id_table); | |||
504 | 504 | ||
505 | static struct usb_driver ipaq_driver = { | 505 | static struct usb_driver ipaq_driver = { |
506 | .name = "ipaq", | 506 | .name = "ipaq", |
507 | .probe = usb_serial_probe, | ||
508 | .disconnect = usb_serial_disconnect, | 507 | .disconnect = usb_serial_disconnect, |
509 | .id_table = ipaq_id_table, | 508 | .id_table = ipaq_id_table, |
510 | }; | 509 | }; |
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c index 52c61d7cecd2..b42e1bb3c7e9 100644 --- a/drivers/usb/serial/ipw.c +++ b/drivers/usb/serial/ipw.c | |||
@@ -141,7 +141,6 @@ MODULE_DEVICE_TABLE(usb, usb_ipw_ids); | |||
141 | 141 | ||
142 | static struct usb_driver usb_ipw_driver = { | 142 | static struct usb_driver usb_ipw_driver = { |
143 | .name = "ipwtty", | 143 | .name = "ipwtty", |
144 | .probe = usb_serial_probe, | ||
145 | .disconnect = usb_serial_disconnect, | 144 | .disconnect = usb_serial_disconnect, |
146 | .id_table = usb_ipw_ids, | 145 | .id_table = usb_ipw_ids, |
147 | }; | 146 | }; |
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c index ea09cf7044d7..7cee1019e0d5 100644 --- a/drivers/usb/serial/ir-usb.c +++ b/drivers/usb/serial/ir-usb.c | |||
@@ -79,7 +79,6 @@ MODULE_DEVICE_TABLE(usb, ir_id_table); | |||
79 | 79 | ||
80 | static struct usb_driver ir_driver = { | 80 | static struct usb_driver ir_driver = { |
81 | .name = "ir-usb", | 81 | .name = "ir-usb", |
82 | .probe = usb_serial_probe, | ||
83 | .disconnect = usb_serial_disconnect, | 82 | .disconnect = usb_serial_disconnect, |
84 | .id_table = ir_id_table, | 83 | .id_table = ir_id_table, |
85 | }; | 84 | }; |
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c index c40e5c2d2bb4..88a093180dab 100644 --- a/drivers/usb/serial/iuu_phoenix.c +++ b/drivers/usb/serial/iuu_phoenix.c | |||
@@ -53,7 +53,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
53 | 53 | ||
54 | static struct usb_driver iuu_driver = { | 54 | static struct usb_driver iuu_driver = { |
55 | .name = "iuu_phoenix", | 55 | .name = "iuu_phoenix", |
56 | .probe = usb_serial_probe, | ||
57 | .disconnect = usb_serial_disconnect, | 56 | .disconnect = usb_serial_disconnect, |
58 | .id_table = id_table, | 57 | .id_table = id_table, |
59 | }; | 58 | }; |
diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h index 622853c9e384..4ebf90616cd5 100644 --- a/drivers/usb/serial/keyspan.h +++ b/drivers/usb/serial/keyspan.h | |||
@@ -489,7 +489,6 @@ MODULE_DEVICE_TABLE(usb, keyspan_ids_combined); | |||
489 | 489 | ||
490 | static struct usb_driver keyspan_driver = { | 490 | static struct usb_driver keyspan_driver = { |
491 | .name = "keyspan", | 491 | .name = "keyspan", |
492 | .probe = usb_serial_probe, | ||
493 | .disconnect = usb_serial_disconnect, | 492 | .disconnect = usb_serial_disconnect, |
494 | .id_table = keyspan_ids_combined, | 493 | .id_table = keyspan_ids_combined, |
495 | }; | 494 | }; |
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c index 341ae504915a..218169a7bd75 100644 --- a/drivers/usb/serial/keyspan_pda.c +++ b/drivers/usb/serial/keyspan_pda.c | |||
@@ -88,7 +88,6 @@ MODULE_DEVICE_TABLE(usb, id_table_combined); | |||
88 | 88 | ||
89 | static struct usb_driver keyspan_pda_driver = { | 89 | static struct usb_driver keyspan_pda_driver = { |
90 | .name = "keyspan_pda", | 90 | .name = "keyspan_pda", |
91 | .probe = usb_serial_probe, | ||
92 | .disconnect = usb_serial_disconnect, | 91 | .disconnect = usb_serial_disconnect, |
93 | .id_table = id_table_combined, | 92 | .id_table = id_table_combined, |
94 | }; | 93 | }; |
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c index 02e12702e629..c97ca54bd8b3 100644 --- a/drivers/usb/serial/kl5kusb105.c +++ b/drivers/usb/serial/kl5kusb105.c | |||
@@ -88,7 +88,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
88 | 88 | ||
89 | static struct usb_driver kl5kusb105d_driver = { | 89 | static struct usb_driver kl5kusb105d_driver = { |
90 | .name = "kl5kusb105d", | 90 | .name = "kl5kusb105d", |
91 | .probe = usb_serial_probe, | ||
92 | .disconnect = usb_serial_disconnect, | 91 | .disconnect = usb_serial_disconnect, |
93 | .id_table = id_table, | 92 | .id_table = id_table, |
94 | }; | 93 | }; |
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c index 7336e0ecc20f..d62d1375468e 100644 --- a/drivers/usb/serial/kobil_sct.c +++ b/drivers/usb/serial/kobil_sct.c | |||
@@ -87,7 +87,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
87 | 87 | ||
88 | static struct usb_driver kobil_driver = { | 88 | static struct usb_driver kobil_driver = { |
89 | .name = "kobil", | 89 | .name = "kobil", |
90 | .probe = usb_serial_probe, | ||
91 | .disconnect = usb_serial_disconnect, | 90 | .disconnect = usb_serial_disconnect, |
92 | .id_table = id_table, | 91 | .id_table = id_table, |
93 | }; | 92 | }; |
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c index 4361364a3050..bea53f1ad610 100644 --- a/drivers/usb/serial/mct_u232.c +++ b/drivers/usb/serial/mct_u232.c | |||
@@ -85,7 +85,6 @@ MODULE_DEVICE_TABLE(usb, id_table_combined); | |||
85 | 85 | ||
86 | static struct usb_driver mct_u232_driver = { | 86 | static struct usb_driver mct_u232_driver = { |
87 | .name = "mct_u232", | 87 | .name = "mct_u232", |
88 | .probe = usb_serial_probe, | ||
89 | .disconnect = usb_serial_disconnect, | 88 | .disconnect = usb_serial_disconnect, |
90 | .id_table = id_table_combined, | 89 | .id_table = id_table_combined, |
91 | }; | 90 | }; |
diff --git a/drivers/usb/serial/metro-usb.c b/drivers/usb/serial/metro-usb.c index d17c8677a293..06cf5c87a96c 100644 --- a/drivers/usb/serial/metro-usb.c +++ b/drivers/usb/serial/metro-usb.c | |||
@@ -421,7 +421,6 @@ static void metrousb_unthrottle(struct tty_struct *tty) | |||
421 | 421 | ||
422 | static struct usb_driver metrousb_driver = { | 422 | static struct usb_driver metrousb_driver = { |
423 | .name = "metro-usb", | 423 | .name = "metro-usb", |
424 | .probe = usb_serial_probe, | ||
425 | .disconnect = usb_serial_disconnect, | 424 | .disconnect = usb_serial_disconnect, |
426 | .id_table = id_table | 425 | .id_table = id_table |
427 | }; | 426 | }; |
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index 178b76680079..0a0e8b427235 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c | |||
@@ -2160,7 +2160,6 @@ static void mos7720_release(struct usb_serial *serial) | |||
2160 | 2160 | ||
2161 | static struct usb_driver usb_driver = { | 2161 | static struct usb_driver usb_driver = { |
2162 | .name = "moschip7720", | 2162 | .name = "moschip7720", |
2163 | .probe = usb_serial_probe, | ||
2164 | .disconnect = usb_serial_disconnect, | 2163 | .disconnect = usb_serial_disconnect, |
2165 | .id_table = moschip_port_id_table, | 2164 | .id_table = moschip_port_id_table, |
2166 | }; | 2165 | }; |
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index d9086ee16663..8f370e08c439 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c | |||
@@ -2785,7 +2785,6 @@ static void mos7840_release(struct usb_serial *serial) | |||
2785 | 2785 | ||
2786 | static struct usb_driver io_driver = { | 2786 | static struct usb_driver io_driver = { |
2787 | .name = "mos7840", | 2787 | .name = "mos7840", |
2788 | .probe = usb_serial_probe, | ||
2789 | .disconnect = usb_serial_disconnect, | 2788 | .disconnect = usb_serial_disconnect, |
2790 | .id_table = moschip_id_table_combined, | 2789 | .id_table = moschip_id_table_combined, |
2791 | }; | 2790 | }; |
diff --git a/drivers/usb/serial/moto_modem.c b/drivers/usb/serial/moto_modem.c index 3ab6214b4bbf..36b5a75088c0 100644 --- a/drivers/usb/serial/moto_modem.c +++ b/drivers/usb/serial/moto_modem.c | |||
@@ -33,7 +33,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
33 | 33 | ||
34 | static struct usb_driver moto_driver = { | 34 | static struct usb_driver moto_driver = { |
35 | .name = "moto-modem", | 35 | .name = "moto-modem", |
36 | .probe = usb_serial_probe, | ||
37 | .disconnect = usb_serial_disconnect, | 36 | .disconnect = usb_serial_disconnect, |
38 | .id_table = id_table, | 37 | .id_table = id_table, |
39 | }; | 38 | }; |
diff --git a/drivers/usb/serial/navman.c b/drivers/usb/serial/navman.c index 31de00aeb24e..d750fa14947c 100644 --- a/drivers/usb/serial/navman.c +++ b/drivers/usb/serial/navman.c | |||
@@ -32,7 +32,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
32 | 32 | ||
33 | static struct usb_driver navman_driver = { | 33 | static struct usb_driver navman_driver = { |
34 | .name = "navman", | 34 | .name = "navman", |
35 | .probe = usb_serial_probe, | ||
36 | .disconnect = usb_serial_disconnect, | 35 | .disconnect = usb_serial_disconnect, |
37 | .id_table = id_table, | 36 | .id_table = id_table, |
38 | }; | 37 | }; |
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c index 1b6d53f4c610..5cf1f5a114af 100644 --- a/drivers/usb/serial/omninet.c +++ b/drivers/usb/serial/omninet.c | |||
@@ -59,7 +59,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
59 | 59 | ||
60 | static struct usb_driver omninet_driver = { | 60 | static struct usb_driver omninet_driver = { |
61 | .name = "omninet", | 61 | .name = "omninet", |
62 | .probe = usb_serial_probe, | ||
63 | .disconnect = usb_serial_disconnect, | 62 | .disconnect = usb_serial_disconnect, |
64 | .id_table = id_table, | 63 | .id_table = id_table, |
65 | }; | 64 | }; |
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c index 858ee18f3618..5a0f25c4bc07 100644 --- a/drivers/usb/serial/opticon.c +++ b/drivers/usb/serial/opticon.c | |||
@@ -585,7 +585,6 @@ static int opticon_resume(struct usb_interface *intf) | |||
585 | 585 | ||
586 | static struct usb_driver opticon_driver = { | 586 | static struct usb_driver opticon_driver = { |
587 | .name = "opticon", | 587 | .name = "opticon", |
588 | .probe = usb_serial_probe, | ||
589 | .disconnect = usb_serial_disconnect, | 588 | .disconnect = usb_serial_disconnect, |
590 | .suspend = opticon_suspend, | 589 | .suspend = opticon_suspend, |
591 | .resume = opticon_resume, | 590 | .resume = opticon_resume, |
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index d1674bc3d4fa..a654f17424a4 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
@@ -1222,7 +1222,6 @@ MODULE_DEVICE_TABLE(usb, option_ids); | |||
1222 | 1222 | ||
1223 | static struct usb_driver option_driver = { | 1223 | static struct usb_driver option_driver = { |
1224 | .name = "option", | 1224 | .name = "option", |
1225 | .probe = usb_serial_probe, | ||
1226 | .disconnect = usb_serial_disconnect, | 1225 | .disconnect = usb_serial_disconnect, |
1227 | .id_table = option_ids, | 1226 | .id_table = option_ids, |
1228 | }; | 1227 | }; |
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c index d4bce46df2d1..bd3ce4908d53 100644 --- a/drivers/usb/serial/oti6858.c +++ b/drivers/usb/serial/oti6858.c | |||
@@ -68,7 +68,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
68 | 68 | ||
69 | static struct usb_driver oti6858_driver = { | 69 | static struct usb_driver oti6858_driver = { |
70 | .name = "oti6858", | 70 | .name = "oti6858", |
71 | .probe = usb_serial_probe, | ||
72 | .disconnect = usb_serial_disconnect, | 71 | .disconnect = usb_serial_disconnect, |
73 | .id_table = id_table, | 72 | .id_table = id_table, |
74 | }; | 73 | }; |
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index 34e51a04dde0..93607a4d330b 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c | |||
@@ -97,7 +97,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
97 | 97 | ||
98 | static struct usb_driver pl2303_driver = { | 98 | static struct usb_driver pl2303_driver = { |
99 | .name = "pl2303", | 99 | .name = "pl2303", |
100 | .probe = usb_serial_probe, | ||
101 | .disconnect = usb_serial_disconnect, | 100 | .disconnect = usb_serial_disconnect, |
102 | .id_table = id_table, | 101 | .id_table = id_table, |
103 | }; | 102 | }; |
diff --git a/drivers/usb/serial/qcaux.c b/drivers/usb/serial/qcaux.c index 966245680f55..1be0653570c4 100644 --- a/drivers/usb/serial/qcaux.c +++ b/drivers/usb/serial/qcaux.c | |||
@@ -79,7 +79,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
79 | 79 | ||
80 | static struct usb_driver qcaux_driver = { | 80 | static struct usb_driver qcaux_driver = { |
81 | .name = "qcaux", | 81 | .name = "qcaux", |
82 | .probe = usb_serial_probe, | ||
83 | .disconnect = usb_serial_disconnect, | 82 | .disconnect = usb_serial_disconnect, |
84 | .id_table = id_table, | 83 | .id_table = id_table, |
85 | }; | 84 | }; |
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c index 3696924c1eb3..6c82f468fa19 100644 --- a/drivers/usb/serial/qcserial.c +++ b/drivers/usb/serial/qcserial.c | |||
@@ -114,7 +114,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
114 | 114 | ||
115 | static struct usb_driver qcdriver = { | 115 | static struct usb_driver qcdriver = { |
116 | .name = "qcserial", | 116 | .name = "qcserial", |
117 | .probe = usb_serial_probe, | ||
118 | .disconnect = usb_serial_disconnect, | 117 | .disconnect = usb_serial_disconnect, |
119 | .id_table = id_table, | 118 | .id_table = id_table, |
120 | }; | 119 | }; |
diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c index ae4ee30c7411..15db52206d69 100644 --- a/drivers/usb/serial/safe_serial.c +++ b/drivers/usb/serial/safe_serial.c | |||
@@ -153,7 +153,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
153 | 153 | ||
154 | static struct usb_driver safe_driver = { | 154 | static struct usb_driver safe_driver = { |
155 | .name = "safe_serial", | 155 | .name = "safe_serial", |
156 | .probe = usb_serial_probe, | ||
157 | .disconnect = usb_serial_disconnect, | 156 | .disconnect = usb_serial_disconnect, |
158 | .id_table = id_table, | 157 | .id_table = id_table, |
159 | }; | 158 | }; |
diff --git a/drivers/usb/serial/siemens_mpi.c b/drivers/usb/serial/siemens_mpi.c index 46c0430fd38b..b5e929865b94 100644 --- a/drivers/usb/serial/siemens_mpi.c +++ b/drivers/usb/serial/siemens_mpi.c | |||
@@ -31,7 +31,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
31 | 31 | ||
32 | static struct usb_driver siemens_usb_mpi_driver = { | 32 | static struct usb_driver siemens_usb_mpi_driver = { |
33 | .name = "siemens_mpi", | 33 | .name = "siemens_mpi", |
34 | .probe = usb_serial_probe, | ||
35 | .disconnect = usb_serial_disconnect, | 34 | .disconnect = usb_serial_disconnect, |
36 | .id_table = id_table, | 35 | .id_table = id_table, |
37 | }; | 36 | }; |
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index 7b7771491a64..5f55cfe12e9d 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c | |||
@@ -1053,7 +1053,6 @@ static int sierra_reset_resume(struct usb_interface *intf) | |||
1053 | 1053 | ||
1054 | static struct usb_driver sierra_driver = { | 1054 | static struct usb_driver sierra_driver = { |
1055 | .name = "sierra", | 1055 | .name = "sierra", |
1056 | .probe = usb_serial_probe, | ||
1057 | .disconnect = usb_serial_disconnect, | 1056 | .disconnect = usb_serial_disconnect, |
1058 | .reset_resume = sierra_reset_resume, | 1057 | .reset_resume = sierra_reset_resume, |
1059 | .id_table = id_table, | 1058 | .id_table = id_table, |
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c index 91fea7bf15a6..754b138d1848 100644 --- a/drivers/usb/serial/spcp8x5.c +++ b/drivers/usb/serial/spcp8x5.c | |||
@@ -153,7 +153,6 @@ enum spcp8x5_type { | |||
153 | 153 | ||
154 | static struct usb_driver spcp8x5_driver = { | 154 | static struct usb_driver spcp8x5_driver = { |
155 | .name = "spcp8x5", | 155 | .name = "spcp8x5", |
156 | .probe = usb_serial_probe, | ||
157 | .disconnect = usb_serial_disconnect, | 156 | .disconnect = usb_serial_disconnect, |
158 | .id_table = id_table, | 157 | .id_table = id_table, |
159 | }; | 158 | }; |
diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c index 9820492cf885..fcc00241afec 100644 --- a/drivers/usb/serial/ssu100.c +++ b/drivers/usb/serial/ssu100.c | |||
@@ -65,7 +65,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
65 | 65 | ||
66 | static struct usb_driver ssu100_driver = { | 66 | static struct usb_driver ssu100_driver = { |
67 | .name = "ssu100", | 67 | .name = "ssu100", |
68 | .probe = usb_serial_probe, | ||
69 | .disconnect = usb_serial_disconnect, | 68 | .disconnect = usb_serial_disconnect, |
70 | .id_table = id_table, | 69 | .id_table = id_table, |
71 | }; | 70 | }; |
diff --git a/drivers/usb/serial/symbolserial.c b/drivers/usb/serial/symbolserial.c index 04e881217fe5..454d80ab6f6c 100644 --- a/drivers/usb/serial/symbolserial.c +++ b/drivers/usb/serial/symbolserial.c | |||
@@ -271,7 +271,6 @@ static void symbol_release(struct usb_serial *serial) | |||
271 | 271 | ||
272 | static struct usb_driver symbol_driver = { | 272 | static struct usb_driver symbol_driver = { |
273 | .name = "symbol", | 273 | .name = "symbol", |
274 | .probe = usb_serial_probe, | ||
275 | .disconnect = usb_serial_disconnect, | 274 | .disconnect = usb_serial_disconnect, |
276 | .id_table = id_table, | 275 | .id_table = id_table, |
277 | }; | 276 | }; |
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index 925f5f407cc5..29b9c95105c3 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c | |||
@@ -213,7 +213,6 @@ static struct usb_device_id ti_id_table_combined[18+2*TI_EXTRA_VID_PID_COUNT+1] | |||
213 | 213 | ||
214 | static struct usb_driver ti_usb_driver = { | 214 | static struct usb_driver ti_usb_driver = { |
215 | .name = "ti_usb_3410_5052", | 215 | .name = "ti_usb_3410_5052", |
216 | .probe = usb_serial_probe, | ||
217 | .disconnect = usb_serial_disconnect, | 216 | .disconnect = usb_serial_disconnect, |
218 | .id_table = ti_id_table_combined, | 217 | .id_table = ti_id_table_combined, |
219 | }; | 218 | }; |
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index f7b263e237ef..e8c4ac964e39 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c | |||
@@ -1098,7 +1098,6 @@ probe_error: | |||
1098 | module_put(type->driver.owner); | 1098 | module_put(type->driver.owner); |
1099 | return -EIO; | 1099 | return -EIO; |
1100 | } | 1100 | } |
1101 | EXPORT_SYMBOL_GPL(usb_serial_probe); | ||
1102 | 1101 | ||
1103 | void usb_serial_disconnect(struct usb_interface *interface) | 1102 | void usb_serial_disconnect(struct usb_interface *interface) |
1104 | { | 1103 | { |
@@ -1400,6 +1399,7 @@ int usb_serial_register_drivers(struct usb_driver *udriver, | |||
1400 | udriver->supports_autosuspend = 1; | 1399 | udriver->supports_autosuspend = 1; |
1401 | udriver->suspend = usb_serial_suspend; | 1400 | udriver->suspend = usb_serial_suspend; |
1402 | udriver->resume = usb_serial_resume; | 1401 | udriver->resume = usb_serial_resume; |
1402 | udriver->probe = usb_serial_probe; | ||
1403 | rc = usb_register(udriver); | 1403 | rc = usb_register(udriver); |
1404 | if (rc) | 1404 | if (rc) |
1405 | return rc; | 1405 | return rc; |
diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c index e3e8995a4739..4e5426f39859 100644 --- a/drivers/usb/serial/usb_debug.c +++ b/drivers/usb/serial/usb_debug.c | |||
@@ -37,7 +37,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
37 | 37 | ||
38 | static struct usb_driver debug_driver = { | 38 | static struct usb_driver debug_driver = { |
39 | .name = "debug", | 39 | .name = "debug", |
40 | .probe = usb_serial_probe, | ||
41 | .disconnect = usb_serial_disconnect, | 40 | .disconnect = usb_serial_disconnect, |
42 | .id_table = id_table, | 41 | .id_table = id_table, |
43 | }; | 42 | }; |
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c index d9b41fa50203..36e782af0999 100644 --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c | |||
@@ -165,7 +165,6 @@ MODULE_DEVICE_TABLE(usb, id_table_combined); | |||
165 | 165 | ||
166 | static struct usb_driver visor_driver = { | 166 | static struct usb_driver visor_driver = { |
167 | .name = "visor", | 167 | .name = "visor", |
168 | .probe = usb_serial_probe, | ||
169 | .disconnect = usb_serial_disconnect, | 168 | .disconnect = usb_serial_disconnect, |
170 | .id_table = id_table_combined, | 169 | .id_table = id_table_combined, |
171 | }; | 170 | }; |
diff --git a/drivers/usb/serial/vivopay-serial.c b/drivers/usb/serial/vivopay-serial.c index 078f338b5feb..939ad7fb876f 100644 --- a/drivers/usb/serial/vivopay-serial.c +++ b/drivers/usb/serial/vivopay-serial.c | |||
@@ -27,7 +27,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
27 | 27 | ||
28 | static struct usb_driver vivopay_serial_driver = { | 28 | static struct usb_driver vivopay_serial_driver = { |
29 | .name = "vivopay-serial", | 29 | .name = "vivopay-serial", |
30 | .probe = usb_serial_probe, | ||
31 | .disconnect = usb_serial_disconnect, | 30 | .disconnect = usb_serial_disconnect, |
32 | .id_table = id_table, | 31 | .id_table = id_table, |
33 | }; | 32 | }; |
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c index d07794fda006..a0df894b3428 100644 --- a/drivers/usb/serial/whiteheat.c +++ b/drivers/usb/serial/whiteheat.c | |||
@@ -79,7 +79,6 @@ MODULE_DEVICE_TABLE(usb, id_table_combined); | |||
79 | 79 | ||
80 | static struct usb_driver whiteheat_driver = { | 80 | static struct usb_driver whiteheat_driver = { |
81 | .name = "whiteheat", | 81 | .name = "whiteheat", |
82 | .probe = usb_serial_probe, | ||
83 | .disconnect = usb_serial_disconnect, | 82 | .disconnect = usb_serial_disconnect, |
84 | .id_table = id_table_combined, | 83 | .id_table = id_table_combined, |
85 | }; | 84 | }; |
diff --git a/drivers/usb/serial/zio.c b/drivers/usb/serial/zio.c index 9d0bb3752cd4..2e858c35d9cf 100644 --- a/drivers/usb/serial/zio.c +++ b/drivers/usb/serial/zio.c | |||
@@ -24,7 +24,6 @@ MODULE_DEVICE_TABLE(usb, id_table); | |||
24 | 24 | ||
25 | static struct usb_driver zio_driver = { | 25 | static struct usb_driver zio_driver = { |
26 | .name = "zio", | 26 | .name = "zio", |
27 | .probe = usb_serial_probe, | ||
28 | .disconnect = usb_serial_disconnect, | 27 | .disconnect = usb_serial_disconnect, |
29 | .id_table = id_table, | 28 | .id_table = id_table, |
30 | }; | 29 | }; |