USB: serial: remove usb_serial_probe call in all drivers

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 <wgreathouse@smva.com>
Cc: Matthias Bruestle and Harald Welte <support@reiner-sct.com>
Cc: Lonnie Mendez <dignome@gmail.com>
Cc: Peter Berger <pberger@brimson.com>
Cc: Al Borchers <alborchers@steinerpoint.com>
Cc: Gary Brubaker <xavyer@ix.netcom.com>
Cc: Oliver Neukum <oliver@neukum.name>
Cc: Matthias Urlichs <smurf@smurf.noris.de>
Cc: Support Department <support@connecttech.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Kautuk Consul <consul.kautuk@gmail.com>
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Bart Hartgers <bart.hartgers@gmail.com>
Cc: Johan Hovold <jhovold@gmail.com>
Cc: Preston Fick <preston.fick@silabs.com>
Cc: Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
Cc: Simon Arlott <simon@fire.lp0.eu>
Cc: Andrew Worsley <amworsley@gmail.com>
Cc: "Michał Wróbel" <michal.wrobel@flytronic.pl>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Aleksey Babahin <tamerlan311@gmail.com>
Cc: Dan Carpenter <error27@gmail.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Donald Lee <donald@asix.com.tw>
Cc: Julia Lawall <julia@diku.dk>
Cc: Michal Sroczynski <msroczyn@gmail.com>
Cc: Wang YanQing <Udknight@gmail.com>
Cc: Dan Williams <dcbw@redhat.com>
Cc: Thomas Tuttle <ttuttle@chromium.org>
Cc: Rigbert Hamisch <rigbert@gmx.de>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Jesper Juhl <jj@chaosbits.net>
Cc: Adhir Ramjiawan <adhirramjiawan0@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/quatech_usb2/quatech_usb2.c b/drivers/staging/quatech_usb2/quatech_usb2.c
index 7739ada045e614b5f1198e229d16fb03cdcf5189..70147b9d2b52f08d87b7daec77696b7af9acbb1e 100644 (file)
--- 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 b547b7b6eecbc1ed7c3d1f0031c62bda73dd90cf..d6e5e18332f4e8b219cc8f896c3447b5ace805e2 100644 (file)
--- 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 eec4fb9a35c1e5ec1e0e8355a8f4779f9bc302b8..ac69b82b1fe775d73aa32650df87596e409729ac 100644 (file)
--- 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 f99f47100dd8f7e7031a6d350b84dbb79a79ed58..33dc0e37ebb7d464006ef280b3902fb56c33dae2 100644 (file)
--- 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 20073856cd187354432c50289d0e45b7e1973413..eb12616dbf6fa803b34d52491fa830735dac0863 100644 (file)
--- 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 ba4f067cf277aa85a9e3c5ada039907429ed36dd..83fd8e08ea532d1503f9e0134c9eccd60eb0001c 100644 (file)
--- 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 81468c0f5e619514ba66e1679e28c8082eedcdb6..cbfc08dd67cd833458eb633af3d1bc03cc18292e 100644 (file)
--- 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 7b804fd397c9f46e9e3c137110d8a0067088d4ac..5e765085fad080020500f7ddd2d1e33c4d425d7d 100644 (file)
--- 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 6fac26c5fd53e10a1518cf7dbb91e31cc370b5bb..14b64ba3eec049b81acd7a355530db8f7bafd57f 100644 (file)
--- 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 f8dad3a3427bc2c10539b4bb0e413fef371ebb50..00abe81b55204717a9c1cfb10f850e969257a678 100644 (file)
--- 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 615e3803cfb9b78f7553c9f174aff74ae7078591..cbef1a5d87a0df1b7d5bf8660a847b0434a7345e 100644 (file)
--- 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 c32486d73a76d539b72e1fc8cb02fdb929e52842..db65e7e9f8da1437ce2c807c5cd97b9790e16814 100644 (file)
--- 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 5691b8be0c773511ac4a58c328d00bec421b5772..40f9993b3796e8471f17f2f7a2975281a0c5e722 100644 (file)
--- 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 4577b360792274fa887b0890c1788f02adb61694..168acbb54a0cef032a98f0efbc466c5ae33b88cc 100644 (file)
--- 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 52c079d02ca3465fb9efcc075776b83edb83db95..3a570597f58729f68b4feb3aaf002847087e7bf8 100644 (file)
--- 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 2563e788c9b3b3a750414604e37d927423e8175a..d800ff308bd34f447424f678d7c381ad8cffbd58 100644 (file)
--- 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 d0e7c9affb6f63c5ef6eabd0b09cb2eddb5e14fa..7498b5e6a039d3ec2481f9c0b3de8c87b939de88 100644 (file)
--- 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 5e4b47194819e0326579e9753a70c8d61c1a30ba..88ab9f6be1ed64c1117a65e7172c093fbe259ec4 100644 (file)
--- 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 65b689a4e36f1bf4410282d8d6728c1c5d59f280..340c39e330b01f21e471279f3a8fe8d2e09b00a9 100644 (file)
--- 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 52c61d7cecd23c69682e0ff34609715229be1c82..b42e1bb3c7e9c23e411b222f6e485330e2513193 100644 (file)
--- 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 ea09cf7044d7843a84e5b784ae0d5b344be53b54..7cee1019e0d54ead4789c746e01587655880f5fa 100644 (file)
--- 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 c40e5c2d2bb4f933a5c41dfa3b6514d7a1a29dca..88a093180dab7b6051ad9f26f3aa2471ad520deb 100644 (file)
--- 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 622853c9e384a3edf91624963ba729b7909a671b..4ebf90616cd5d430c04464abb1e692674e04ac4d 100644 (file)
--- 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 341ae504915a0b6ae892b6a5bd129a3c67237f57..218169a7bd7570fa0b51adf74f14784f0e154a60 100644 (file)
--- 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 02e12702e62997d9bfcdfeb22f1e72e65e1bed3a..c97ca54bd8b35d47abc992cb36972f615bec67a5 100644 (file)
--- 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 7336e0ecc20fd1b3beb2022cbb4b97e59980b46a..d62d1375468ef5aba23f9a891da719059035eb66 100644 (file)
--- 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 4361364a3050ae22a504722fd4f671babe3220fb..bea53f1ad6109d737da5affec1098a95b1fcfef8 100644 (file)
--- 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 d17c8677a29359d4763f2f459f83ad146291194d..06cf5c87a96c77acc76cf50f032873b89c486806 100644 (file)
--- 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 178b766800795700fe9c27ea8d45773cdf8443c3..0a0e8b4272352b74328db4cf0785ba7d9d4bdfab 100644 (file)
--- 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 d9086ee16663e080479663ed3173a4d857ae0c5e..8f370e08c4390ea52e425c310c6bad86d1984ce8 100644 (file)
--- 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 3ab6214b4bbffa651f4c97e3ba57018c15e2662c..36b5a75088c027f707987897be91b74bcaa4a6d0 100644 (file)
--- 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 31de00aeb24e089817148ccf84610bf2b4b7df3e..d750fa14947cb71e9169987dbdd3fad4d668eb4e 100644 (file)
--- 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 1b6d53f4c610d240059854f51d9e6a494bc20cdf..5cf1f5a114afa10de861a0c84864c61b4404d544 100644 (file)
--- 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 858ee18f3618bb88b06d038235f9a93fc3c65531..5a0f25c4bc079b0aa2ab6948bf202ba341cbb69d 100644 (file)
--- 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 d1674bc3d4fafb9e8c24fca86e5f169955be7a61..a654f17424a4aec2e819d7b1968886d27dea3a51 100644 (file)
--- 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 d4bce46df2d1c80f9cfbc51f1d9d653e72ff5c05..bd3ce4908d53b144828d7acb20fc3cc1e3814e06 100644 (file)
--- 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 34e51a04dde07f3118a21ab3ec0fbc901569d50c..93607a4d330b010c1fef1d77467cd26166122f4b 100644 (file)
--- 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 966245680f55aea59ca90681f3e3cff3e3793883..1be0653570c409a95dea7db164288585f957f020 100644 (file)
--- 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 3696924c1eb3a5272d767ed0b973ae6ca1605ac0..6c82f468fa19d0dfdd6a55da9bbc9ddb7c6bf791 100644 (file)
--- 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 ae4ee30c7411882dd9df3e22d436db54ee28ddcf..15db52206d698e5dfe9669f6dba4dc29ed0db0e9 100644 (file)
--- 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 46c0430fd38b182c803be9f493ab654599575f65..b5e929865b94a778df3aad95e4a2ad8da1a3f3a0 100644 (file)
--- 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 7b7771491a64318ad92a0d862d96171a89fb806f..5f55cfe12e9ded15b2ed34dd0c22d65e41082475 100644 (file)
--- 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 91fea7bf15a69eea9fec2600a984e331862b68c4..754b138d18489434a9da608ad18cddd84288801e 100644 (file)
--- 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 9820492cf885ced3a35b747db31e013c35275b7f..fcc00241afece4c11f2a7066039a5afa7aec6524 100644 (file)
--- 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 04e881217fe575a7f852294b0a3881c0100222c6..454d80ab6f6c5ef3bf69b67c8ad1bc39e57f41a3 100644 (file)
--- 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 925f5f407cc5abaf4408be882fd679c3f2b8666f..29b9c95105c31602efcf75d756a8f3bdc3f9779f 100644 (file)
--- 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 f7b263e237ef927294309a3c945df9426e1da6eb..e8c4ac964e3941aa48cda819cb9f0cb2d7d5e38a 100644 (file)
--- 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 e3e8995a47391974f76d1d7ec631f7730839e9e2..4e5426f39859661f7ff2be357e1c5156d15c6c3f 100644 (file)
--- 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 d9b41fa50203f8f35df510c70b987d2bb12be30f..36e782af099939ba0fd07ee04b5194e9f3a0cc97 100644 (file)
--- 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 078f338b5feb108c5c635cd1bcfabb2e6ce280cc..939ad7fb876fc81d9369cf8857122f709d27ab4f 100644 (file)
--- 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 d07794fda006d219c497b3c338b5cfbfde65ccfd..a0df894b342895af5277d92c62b6a0570708b7d2 100644 (file)
--- 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 9d0bb3752cd47791b5a454ca0b4376bea2009c1b..2e858c35d9cf49d7b69cab58d884c4f57c5ebb10 100644 (file)
--- 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,
 };