diff --git a/drivers/staging/quatech_usb2/quatech_usb2.c b/drivers/staging/quatech_usb2/quatech_usb2.c
index 70147b9d2b52f08d87b7daec77696b7af9acbb1e..4e9c00e532612e99150756bb5ec27e7f93619eea 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",
-	.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 d6e5e18332f4e8b219cc8f896c3447b5ace805e2..1ffdaefa79befcd1e2cbfc28680259f229461ede 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",
-	.disconnect = usb_serial_disconnect,
 	.id_table = serqt_id_table,
 };
 
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index ac69b82b1fe775d73aa32650df87596e409729ac..93aabd292b4833868d80c68a22f1fafdf82458cd 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table,
 };
 
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
index 33dc0e37ebb7d464006ef280b3902fb56c33dae2..4b79679183ba2d8558c10c2fad499983c91c7dba 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",
-	.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 eb12616dbf6fa803b34d52491fa830735dac0863..13031bb1e2cbe7e1f7f281a759f2068f545c6407 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table_combined,
 };
 
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index 83fd8e08ea532d1503f9e0134c9eccd60eb0001c..4f0260a9013a55c959e27b95c805482ef2bbb28e 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",
-	.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 cbfc08dd67cd833458eb633af3d1bc03cc18292e..02a1cab924858e5b0d975318abf30a4180bf276e 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",
-	.disconnect	= usb_serial_disconnect,
 	.id_table	= id_table,
 };
 
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 5e765085fad080020500f7ddd2d1e33c4d425d7d..37fb911c1cc06f427863af63be14baff83d7f823 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",
-	.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 14b64ba3eec049b81acd7a355530db8f7bafd57f..df53d57edb3f3251b9040c92f862ab708d75662f 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",
-	.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 00abe81b55204717a9c1cfb10f850e969257a678..3b584db1599f7887ef4a6a232a0802d889ff7c04 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table_combined,
 };
 
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index cbef1a5d87a0df1b7d5bf8660a847b0434a7345e..80447e5a6926da7c62493a49567d10036449678f 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table,
 };
 
diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
index db65e7e9f8da1437ce2c807c5cd97b9790e16814..9052ec3cdf704f236a3329c8c275895b837db3b7 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",
-	.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 40f9993b3796e8471f17f2f7a2975281a0c5e722..7fbba462a68e7e07ac08f5557bbb5b64cc587ca1 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table_combined,
 };
 
diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c
index 168acbb54a0cef032a98f0efbc466c5ae33b88cc..2049911ae75944a0945bca7e233e9de357cbf10c 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",
-	.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 3a570597f58729f68b4feb3aaf002847087e7bf8..0e595a6521ec75c799c1e71d06fe5f7c62e4b48e 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table,
 };
 
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 2cc39badf90a97dd07cf7cabb34006bf96cf3dbd..a2dcf0871811a8ef61e7275e919cb18f4245dc68 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -52,7 +52,6 @@ static const struct usb_device_id generic_serial_ids[] = {
 static struct usb_driver generic_driver = {
 	.name =		"usbserial_generic",
 	.probe =	generic_probe,
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	generic_serial_ids,
 };
 
diff --git a/drivers/usb/serial/hp4x.c b/drivers/usb/serial/hp4x.c
index d800ff308bd34f447424f678d7c381ad8cffbd58..37fe402ba830fb585f8ab7f6ff25022ccaeb5311 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",
-	.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 7498b5e6a039d3ec2481f9c0b3de8c87b939de88..650693b1e18b4b547b7973d8b7ec737b7a2aa17d 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",
-	.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 88ab9f6be1ed64c1117a65e7172c093fbe259ec4..643c120143125b6886e4f440f492408b0fecbf78 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table_combined,
 };
 
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index 340c39e330b01f21e471279f3a8fe8d2e09b00a9..7d1ae700c29d0302e8ea8712fb91b13b9647f0fd 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	ipaq_id_table,
 };
 
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index b42e1bb3c7e9c23e411b222f6e485330e2513193..76901336cfeb942fe85b608eadf09e30e9dcbf8f 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",
-	.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 7cee1019e0d54ead4789c746e01587655880f5fa..c69a81ec2fd68dad49570f78843d50480852de6b 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",
-	.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 88a093180dab7b6051ad9f26f3aa2471ad520deb..500e8fbdd9e524a3348265a9a63b46474d559276 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",
-	.disconnect = usb_serial_disconnect,
 	.id_table = id_table,
 };
 
diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
index 4ebf90616cd5d430c04464abb1e692674e04ac4d..bb018dfaaa4aa57b1b22ac1a3b80baf1bfba1c1b 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",                
-	.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 218169a7bd7570fa0b51adf74f14784f0e154a60..62574cf7e74c0b545c794dd54b279588d6af53e9 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table_combined,
 };
 
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index c97ca54bd8b35d47abc992cb36972f615bec67a5..26dcfac6f6a8adafb2651003a4888b6813156551 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",
-	.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 d62d1375468ef5aba23f9a891da719059035eb66..68fb36a81b46cbfc8020f25adf0950672f104ce6 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",
-	.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 bea53f1ad6109d737da5affec1098a95b1fcfef8..a63d1e8be91139d325ae957d8920995cdf3e5659 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",
-	.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 06cf5c87a96c77acc76cf50f032873b89c486806..14ad1db38ab598882103951e440c09b319ee2381 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table
 };
 
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 0a0e8b4272352b74328db4cf0785ba7d9d4bdfab..eef0d844ef7648b9b0e4c64a741e84c317215087 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",
-	.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 8f370e08c4390ea52e425c310c6bad86d1984ce8..91c3c5eb74c512f28d7766d12ebe2865e91a160a 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",
-	.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 36b5a75088c027f707987897be91b74bcaa4a6d0..f6b055fb8eec82957d362a0c4aaecd19e88dae27 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table,
 };
 
diff --git a/drivers/usb/serial/navman.c b/drivers/usb/serial/navman.c
index d750fa14947cb71e9169987dbdd3fad4d668eb4e..6f12bbc51fc9635f5a0e8c86a2e9ba09a8cb7b15 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table,
 };
 
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index 5cf1f5a114afa10de861a0c84864c61b4404d544..72176f38d2198702422b885524bd8badb1ecd7d9 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table,
 };
 
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 5a0f25c4bc079b0aa2ab6948bf202ba341cbb69d..fe12cac4462cbec0af2efe42dacc8b14beda0675 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",
-	.disconnect =	usb_serial_disconnect,
 	.suspend =	opticon_suspend,
 	.resume =	opticon_resume,
 	.id_table =	id_table,
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index a654f17424a4aec2e819d7b1968886d27dea3a51..780c27658b9c733d0be927b4e9f9c0e644a2b671 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",
-	.disconnect = usb_serial_disconnect,
 	.id_table   = option_ids,
 };
 
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index bd3ce4908d53b144828d7acb20fc3cc1e3814e06..9b195030cbaa94e27c7b4bf8405e466bbf63b212 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table,
 };
 
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 93607a4d330b010c1fef1d77467cd26166122f4b..642136e39fa690e3c1ae33a876fb784300e266f1 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table,
 };
 
diff --git a/drivers/usb/serial/qcaux.c b/drivers/usb/serial/qcaux.c
index 1be0653570c409a95dea7db164288585f957f020..b0b41c11e1470162a5b6e440c7badfbb62c1849f 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table,
 };
 
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
index 6c82f468fa19d0dfdd6a55da9bbc9ddb7c6bf791..400a59e4b0edaec1e68a6510f32b87be84bb49fd 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",
-	.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 15db52206d698e5dfe9669f6dba4dc29ed0db0e9..546ea12455f38704b33474c9846c7a2dfc2c7cf2 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",
-	.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 b5e929865b94a778df3aad95e4a2ad8da1a3f3a0..0d3108af1d044a75bc58a7e78510e1e25c8d682f 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table,
 };
 
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 5f55cfe12e9ded15b2ed34dd0c22d65e41082475..11be3c6c958c71ff37b2085ace1d3e37e91910c3 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",
-	.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 754b138d18489434a9da608ad18cddd84288801e..51e43ccef10c1a07895e3420ca3deab06b6a6da7 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",
-	.disconnect =		usb_serial_disconnect,
 	.id_table =		id_table,
 };
 
diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c
index fcc00241afece4c11f2a7066039a5afa7aec6524..f72b03f83be2bd505a0a6e3c6a0fcc8bd47d4ee7 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",
-	.disconnect		       = usb_serial_disconnect,
 	.id_table		       = id_table,
 };
 
diff --git a/drivers/usb/serial/symbolserial.c b/drivers/usb/serial/symbolserial.c
index 454d80ab6f6c5ef3bf69b67c8ad1bc39e57f41a3..5ef07ca6fe92f1ce7e815cefc9294df2f8c0efa2 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",
-	.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 29b9c95105c31602efcf75d756a8f3bdc3f9779f..9d96224494b832400bcdcd8e498f4780d0753f0d 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",
-	.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 e8c4ac964e3941aa48cda819cb9f0cb2d7d5e38a..9791312052e96438fa947515c0f28bc7367f7c9e 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -43,17 +43,6 @@
 #define DRIVER_AUTHOR "Greg Kroah-Hartman, greg@kroah.com, http://www.kroah.com/linux/"
 #define DRIVER_DESC "USB Serial Driver core"
 
-/* Driver structure we register with the USB core */
-static struct usb_driver usb_serial_driver = {
-	.name =		"usbserial",
-	.probe =	usb_serial_probe,
-	.disconnect =	usb_serial_disconnect,
-	.suspend =	usb_serial_suspend,
-	.resume =	usb_serial_resume,
-	.no_dynamic_id =	1,
-	.supports_autosuspend =	1,
-};
-
 /* There is no MODULE_DEVICE_TABLE for usbserial.c.  Instead
    the MODULE_DEVICE_TABLE declarations in each serial driver
    cause the "hotplug" program to pull in whatever module is necessary
@@ -1099,7 +1088,7 @@ int usb_serial_probe(struct usb_interface *interface,
 	return -EIO;
 }
 
-void usb_serial_disconnect(struct usb_interface *interface)
+static void usb_serial_disconnect(struct usb_interface *interface)
 {
 	int i;
 	struct usb_serial *serial = usb_get_intfdata(interface);
@@ -1134,7 +1123,6 @@ void usb_serial_disconnect(struct usb_interface *interface)
 	usb_serial_put(serial);
 	dev_info(dev, "device disconnected\n");
 }
-EXPORT_SYMBOL_GPL(usb_serial_disconnect);
 
 int usb_serial_suspend(struct usb_interface *intf, pm_message_t message)
 {
@@ -1201,6 +1189,17 @@ static const struct tty_operations serial_ops = {
 
 struct tty_driver *usb_serial_tty_driver;
 
+/* Driver structure we register with the USB core */
+static struct usb_driver usb_serial_driver = {
+	.name =		"usbserial",
+	.probe =	usb_serial_probe,
+	.disconnect =	usb_serial_disconnect,
+	.suspend =	usb_serial_suspend,
+	.resume =	usb_serial_resume,
+	.no_dynamic_id =	1,
+	.supports_autosuspend =	1,
+};
+
 static int __init usb_serial_init(void)
 {
 	int i;
@@ -1400,6 +1399,7 @@ int usb_serial_register_drivers(struct usb_driver *udriver,
 	udriver->suspend = usb_serial_suspend;
 	udriver->resume = usb_serial_resume;
 	udriver->probe = usb_serial_probe;
+	udriver->disconnect = usb_serial_disconnect;
 	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 4e5426f39859661f7ff2be357e1c5156d15c6c3f..e22e5435ff962b37608b40e20f58b1bc98eb2bf6 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table,
 };
 
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index 36e782af099939ba0fd07ee04b5194e9f3a0cc97..2e24bd34754cd37e1a6773360a1f170ace1fb61a 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",
-	.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 939ad7fb876fc81d9369cf8857122f709d27ab4f..c7d8ab359454730258be17ef3bc139c306c1a1a2 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",
-	.disconnect =		usb_serial_disconnect,
 	.id_table =		id_table,
 };
 
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index a0df894b342895af5277d92c62b6a0570708b7d2..76840cdb818dfb20f5e2bad0c7155d259150f192 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table_combined,
 };
 
diff --git a/drivers/usb/serial/zio.c b/drivers/usb/serial/zio.c
index 2e858c35d9cf49d7b69cab58d884c4f57c5ebb10..4822cc84a668cc507f9b813a985e5244335f63ad 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",
-	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table,
 };
 
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index 4742838882332ac766a97ddc9c582afde6127457..17e9746bbeb0599ace9f6a617285f197f55fe1b7 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -300,7 +300,6 @@ extern void usb_serial_port_softint(struct usb_serial_port *port);
 
 extern int usb_serial_probe(struct usb_interface *iface,
 			    const struct usb_device_id *id);
-extern void usb_serial_disconnect(struct usb_interface *iface);
 
 extern int usb_serial_suspend(struct usb_interface *intf, pm_message_t message);
 extern int usb_serial_resume(struct usb_interface *intf);