From 5026bb07be87ef5892742e6853ae6efa0f41961f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 7 May 2012 13:48:33 -0700 Subject: [PATCH] USB: serial: remove usb_serial_probe call in all drivers MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is now set by the usb-serial core, no need for the driver to individually set it. Thanks to Alan Stern for the idea to get rid of it. Cc: William Greathouse Cc: Matthias Bruestle and Harald Welte Cc: Lonnie Mendez Cc: Peter Berger Cc: Al Borchers Cc: Gary Brubaker Cc: Oliver Neukum Cc: Matthias Urlichs Cc: Support Department Cc: Rusty Russell Cc: Alan Stern Cc: Mauro Carvalho Chehab Cc: Kautuk Consul Cc: Bill Pemberton Cc: Paul Gortmaker Cc: Bart Hartgers Cc: Johan Hovold Cc: Preston Fick Cc: Uwe Bonnes Cc: Simon Arlott Cc: Andrew Worsley Cc: "Michał Wróbel" Cc: Andrew Morton Cc: Eric Dumazet Cc: "Eric W. Biederman" Cc: Felipe Balbi Cc: Aleksey Babahin Cc: Dan Carpenter Cc: Jiri Kosina Cc: Donald Lee Cc: Julia Lawall Cc: Michal Sroczynski Cc: Wang YanQing Cc: Dan Williams Cc: Thomas Tuttle Cc: Rigbert Hamisch Cc: "Rafael J. Wysocki" Cc: Kuninori Morimoto Cc: Jesper Juhl Cc: Adhir Ramjiawan Signed-off-by: Greg Kroah-Hartman --- drivers/staging/quatech_usb2/quatech_usb2.c | 1 - drivers/staging/serqt_usb2/serqt_usb2.c | 1 - drivers/usb/serial/aircable.c | 1 - drivers/usb/serial/ark3116.c | 1 - drivers/usb/serial/belkin_sa.c | 1 - drivers/usb/serial/ch341.c | 1 - drivers/usb/serial/cp210x.c | 1 - drivers/usb/serial/cyberjack.c | 1 - drivers/usb/serial/cypress_m8.c | 1 - drivers/usb/serial/digi_acceleport.c | 1 - drivers/usb/serial/empeg.c | 1 - drivers/usb/serial/f81232.c | 1 - drivers/usb/serial/ftdi_sio.c | 1 - drivers/usb/serial/funsoft.c | 1 - drivers/usb/serial/garmin_gps.c | 1 - drivers/usb/serial/hp4x.c | 1 - drivers/usb/serial/io_tables.h | 1 - drivers/usb/serial/io_ti.c | 1 - drivers/usb/serial/ipaq.c | 1 - drivers/usb/serial/ipw.c | 1 - drivers/usb/serial/ir-usb.c | 1 - drivers/usb/serial/iuu_phoenix.c | 1 - drivers/usb/serial/keyspan.h | 1 - drivers/usb/serial/keyspan_pda.c | 1 - drivers/usb/serial/kl5kusb105.c | 1 - drivers/usb/serial/kobil_sct.c | 1 - drivers/usb/serial/mct_u232.c | 1 - drivers/usb/serial/metro-usb.c | 1 - drivers/usb/serial/mos7720.c | 1 - drivers/usb/serial/mos7840.c | 1 - drivers/usb/serial/moto_modem.c | 1 - drivers/usb/serial/navman.c | 1 - drivers/usb/serial/omninet.c | 1 - drivers/usb/serial/opticon.c | 1 - drivers/usb/serial/option.c | 1 - drivers/usb/serial/oti6858.c | 1 - drivers/usb/serial/pl2303.c | 1 - drivers/usb/serial/qcaux.c | 1 - drivers/usb/serial/qcserial.c | 1 - drivers/usb/serial/safe_serial.c | 1 - drivers/usb/serial/siemens_mpi.c | 1 - drivers/usb/serial/sierra.c | 1 - drivers/usb/serial/spcp8x5.c | 1 - drivers/usb/serial/ssu100.c | 1 - drivers/usb/serial/symbolserial.c | 1 - drivers/usb/serial/ti_usb_3410_5052.c | 1 - drivers/usb/serial/usb-serial.c | 2 +- drivers/usb/serial/usb_debug.c | 1 - drivers/usb/serial/visor.c | 1 - drivers/usb/serial/vivopay-serial.c | 1 - drivers/usb/serial/whiteheat.c | 1 - drivers/usb/serial/zio.c | 1 - 52 files changed, 1 insertion(+), 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); /* custom structures we need go here */ static struct usb_driver quausb2_usb_driver = { .name = "quatech-usb2-serial", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = quausb2_id_table, }; 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 { static struct usb_driver serqt_usb_driver = { .name = "quatech-usb-serial", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = serqt_id_table, }; 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) static struct usb_driver aircable_driver = { .name = "aircable", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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) static struct usb_driver ark3116_driver = { .name = "ark3116", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver belkin_driver = { .name = "belkin", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table_combined, }; 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) static struct usb_driver ch341_driver = { .name = "ch341", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .reset_resume = ch341_reset_resume, .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 { static struct usb_driver cp210x_driver = { .name = "cp210x", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver cyberjack_driver = { .name = "cyberjack", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver cypress_driver = { .name = "cypress", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table_combined, }; 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); static struct usb_driver digi_driver = { .name = "digi_acceleport", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table_combined, }; 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); static struct usb_driver empeg_driver = { .name = "empeg", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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) static struct usb_driver f81232_driver = { .name = "f81232", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver ftdi_driver = { .name = "ftdi_sio", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table_combined, }; 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); static struct usb_driver funsoft_driver = { .name = "funsoft", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver garmin_driver = { .name = "garmin_gps", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver hp49gp_driver = { .name = "hp4X", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver io_driver = { .name = "io_edgeport", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table_combined, }; 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); static struct usb_driver io_driver = { .name = "io_ti", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table_combined, }; 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); static struct usb_driver ipaq_driver = { .name = "ipaq", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = ipaq_id_table, }; 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); static struct usb_driver usb_ipw_driver = { .name = "ipwtty", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = usb_ipw_ids, }; 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); static struct usb_driver ir_driver = { .name = "ir-usb", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = ir_id_table, }; 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); static struct usb_driver iuu_driver = { .name = "iuu_phoenix", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver keyspan_driver = { .name = "keyspan", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = keyspan_ids_combined, }; 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); static struct usb_driver keyspan_pda_driver = { .name = "keyspan_pda", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table_combined, }; 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); static struct usb_driver kl5kusb105d_driver = { .name = "kl5kusb105d", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver kobil_driver = { .name = "kobil", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver mct_u232_driver = { .name = "mct_u232", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table_combined, }; 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) static struct usb_driver metrousb_driver = { .name = "metro-usb", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table }; 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) static struct usb_driver usb_driver = { .name = "moschip7720", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = moschip_port_id_table, }; 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) static struct usb_driver io_driver = { .name = "mos7840", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = moschip_id_table_combined, }; 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); static struct usb_driver moto_driver = { .name = "moto-modem", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver navman_driver = { .name = "navman", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver omninet_driver = { .name = "omninet", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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) static struct usb_driver opticon_driver = { .name = "opticon", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .suspend = opticon_suspend, .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); static struct usb_driver option_driver = { .name = "option", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = option_ids, }; 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); static struct usb_driver oti6858_driver = { .name = "oti6858", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver pl2303_driver = { .name = "pl2303", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver qcaux_driver = { .name = "qcaux", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver qcdriver = { .name = "qcserial", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver safe_driver = { .name = "safe_serial", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver siemens_usb_mpi_driver = { .name = "siemens_mpi", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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) static struct usb_driver sierra_driver = { .name = "sierra", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .reset_resume = sierra_reset_resume, .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 { static struct usb_driver spcp8x5_driver = { .name = "spcp8x5", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver ssu100_driver = { .name = "ssu100", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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) static struct usb_driver symbol_driver = { .name = "symbol", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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] static struct usb_driver ti_usb_driver = { .name = "ti_usb_3410_5052", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = ti_id_table_combined, }; 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: module_put(type->driver.owner); return -EIO; } -EXPORT_SYMBOL_GPL(usb_serial_probe); void usb_serial_disconnect(struct usb_interface *interface) { @@ -1400,6 +1399,7 @@ int usb_serial_register_drivers(struct usb_driver *udriver, udriver->supports_autosuspend = 1; udriver->suspend = usb_serial_suspend; udriver->resume = usb_serial_resume; + udriver->probe = usb_serial_probe; rc = usb_register(udriver); if (rc) 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); static struct usb_driver debug_driver = { .name = "debug", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver visor_driver = { .name = "visor", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table_combined, }; 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); static struct usb_driver vivopay_serial_driver = { .name = "vivopay-serial", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; 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); static struct usb_driver whiteheat_driver = { .name = "whiteheat", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table_combined, }; 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); static struct usb_driver zio_driver = { .name = "zio", - .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = id_table, }; -- 2.20.1