usb: Disable dynamic id of USB storage subdrivers

Storage subdrivers, like alauda, datafab and others, don't support
dynamic  id currently, and it needs lots of work but with very little
gain to enable the feature, so disable them in the patch.

Signed-off-by: Huajun Li <huajun.li.lee@gmail.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/storage/alauda.c b/drivers/usb/storage/alauda.c
index 51af2fee2efde3b77b26f0ed301e963cdb9b773e..bab8c8fe8290cfd298e6e4361b9925a1169737e4 100644 (file)
--- a/drivers/usb/storage/alauda.c
+++ b/drivers/usb/storage/alauda.c
@@ -1276,6 +1276,7 @@ static struct usb_driver alauda_driver = {
        .post_reset =   usb_stor_post_reset,
        .id_table =     alauda_usb_ids,
        .soft_unbind =  1,
+       .no_dynamic_id = 1,
 };
 
 module_usb_driver(alauda_driver);

diff --git a/drivers/usb/storage/cypress_atacb.c b/drivers/usb/storage/cypress_atacb.c
index 387cbd47acc994aa7e4235c3ee1d0fd7af7538e2..5fe451d16e6870968ec4dbfc084d37e1e055a361 100644 (file)
--- a/drivers/usb/storage/cypress_atacb.c
+++ b/drivers/usb/storage/cypress_atacb.c
@@ -272,6 +272,7 @@ static struct usb_driver cypress_driver = {
        .post_reset =   usb_stor_post_reset,
        .id_table =     cypress_usb_ids,
        .soft_unbind =  1,
+       .no_dynamic_id = 1,
 };
 
 module_usb_driver(cypress_driver);

diff --git a/drivers/usb/storage/datafab.c b/drivers/usb/storage/datafab.c
index 15d41f2b3d6fcf25bc9a08edabed1f8f9c5c2ecc..35e9c51e66962af08162b5e07022735f7470a4a4 100644 (file)
--- a/drivers/usb/storage/datafab.c
+++ b/drivers/usb/storage/datafab.c
@@ -751,6 +751,7 @@ static struct usb_driver datafab_driver = {
        .post_reset =   usb_stor_post_reset,
        .id_table =     datafab_usb_ids,
        .soft_unbind =  1,
+       .no_dynamic_id = 1,
 };
 
 module_usb_driver(datafab_driver);

diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c
index a6ade4071a9a115c0cd316bd1779ab958523dac3..30532d93eecc3c1fc9d113df1150c12292ab2840 100644 (file)
--- a/drivers/usb/storage/ene_ub6250.c
+++ b/drivers/usb/storage/ene_ub6250.c
@@ -2407,6 +2407,7 @@ static struct usb_driver ene_ub6250_driver = {
        .post_reset =   usb_stor_post_reset,
        .id_table =     ene_ub6250_usb_ids,
        .soft_unbind =  1,
+       .no_dynamic_id = 1,
 };
 
 module_usb_driver(ene_ub6250_driver);

diff --git a/drivers/usb/storage/freecom.c b/drivers/usb/storage/freecom.c
index fa161574847560f90e84549d45fc19856939ff62..042cf9ef3153e194c7474747b8a9aa74986ab0d9 100644 (file)
--- a/drivers/usb/storage/freecom.c
+++ b/drivers/usb/storage/freecom.c
@@ -553,6 +553,7 @@ static struct usb_driver freecom_driver = {
        .post_reset =   usb_stor_post_reset,
        .id_table =     freecom_usb_ids,
        .soft_unbind =  1,
+       .no_dynamic_id = 1,
 };
 
 module_usb_driver(freecom_driver);

diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index bd5502700831e0cdf2364ffaf2c63af9606020f8..31fa24e7e68ab5a4a78336fc3be7c4d140e02cb7 100644 (file)
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -1566,6 +1566,7 @@ static struct usb_driver isd200_driver = {
        .post_reset =   usb_stor_post_reset,
        .id_table =     isd200_usb_ids,
        .soft_unbind =  1,
+       .no_dynamic_id = 1,
 };
 
 module_usb_driver(isd200_driver);

diff --git a/drivers/usb/storage/jumpshot.c b/drivers/usb/storage/jumpshot.c
index a19211b5c2654893ecff3feec45b3c02d75f0e10..e3b97383186ab2f91aaa2df87aeac6304b647259 100644 (file)
--- a/drivers/usb/storage/jumpshot.c
+++ b/drivers/usb/storage/jumpshot.c
@@ -677,6 +677,7 @@ static struct usb_driver jumpshot_driver = {
        .post_reset =   usb_stor_post_reset,
        .id_table =     jumpshot_usb_ids,
        .soft_unbind =  1,
+       .no_dynamic_id = 1,
 };
 
 module_usb_driver(jumpshot_driver);

diff --git a/drivers/usb/storage/karma.c b/drivers/usb/storage/karma.c
index e720f8ebdf9fc711ad164468ce9c1fbfd44c44a9..a8708eae9788eb5cd3104a0b50369fb299d3f58a 100644 (file)
--- a/drivers/usb/storage/karma.c
+++ b/drivers/usb/storage/karma.c
@@ -230,6 +230,7 @@ static struct usb_driver karma_driver = {
        .post_reset =   usb_stor_post_reset,
        .id_table =     karma_usb_ids,
        .soft_unbind =  1,
+       .no_dynamic_id = 1,
 };
 
 module_usb_driver(karma_driver);

diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c
index d75155c382000c52831d9dfb9553dbc49eccf4e0..886567a3806ddd5d190dfb253dabc6afc44e1ea9 100644 (file)
--- a/drivers/usb/storage/onetouch.c
+++ b/drivers/usb/storage/onetouch.c
@@ -312,6 +312,7 @@ static struct usb_driver onetouch_driver = {
        .post_reset =   usb_stor_post_reset,
        .id_table =     onetouch_usb_ids,
        .soft_unbind =  1,
+       .no_dynamic_id = 1,
 };
 
 module_usb_driver(onetouch_driver);

diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
index 1f62723ef1a86013a8f1dbd5d96356559ea0ceda..ccf271d2f6704264373da65aaa24b2184b655e8d 100644 (file)
--- a/drivers/usb/storage/realtek_cr.c
+++ b/drivers/usb/storage/realtek_cr.c
@@ -1100,6 +1100,7 @@ static struct usb_driver realtek_cr_driver = {
        .id_table = realtek_cr_ids,
        .soft_unbind = 1,
        .supports_autosuspend = 1,
+       .no_dynamic_id = 1,
 };
 
 module_usb_driver(realtek_cr_driver);

diff --git a/drivers/usb/storage/sddr09.c b/drivers/usb/storage/sddr09.c
index 425df7df2e5643089eaaef439f3328a978612d82..3252a62b31bcaeb21824ec80323572fe10d0de28 100644 (file)
--- a/drivers/usb/storage/sddr09.c
+++ b/drivers/usb/storage/sddr09.c
@@ -1787,6 +1787,7 @@ static struct usb_driver sddr09_driver = {
        .post_reset =   usb_stor_post_reset,
        .id_table =     sddr09_usb_ids,
        .soft_unbind =  1,
+       .no_dynamic_id = 1,
 };
 
 module_usb_driver(sddr09_driver);

diff --git a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c
index e4ca5fcb7cc3e995fb339b64ff3b2e9eb0b1c863..c144078065a7f691ce3f1e1c57f2d0244510a724 100644 (file)
--- a/drivers/usb/storage/sddr55.c
+++ b/drivers/usb/storage/sddr55.c
@@ -1006,6 +1006,7 @@ static struct usb_driver sddr55_driver = {
        .post_reset =   usb_stor_post_reset,
        .id_table =     sddr55_usb_ids,
        .soft_unbind =  1,
+       .no_dynamic_id = 1,
 };
 
 module_usb_driver(sddr55_driver);

diff --git a/drivers/usb/storage/shuttle_usbat.c b/drivers/usb/storage/shuttle_usbat.c
index 1369d259061607ed4d0dda0f12306653ba88b648..fa1ceebc465ce434a28167bb3c5f633a3e48645b 100644 (file)
--- a/drivers/usb/storage/shuttle_usbat.c
+++ b/drivers/usb/storage/shuttle_usbat.c
@@ -1863,6 +1863,7 @@ static struct usb_driver usbat_driver = {
        .post_reset =   usb_stor_post_reset,
        .id_table =     usbat_usb_ids,
        .soft_unbind =  1,
+       .no_dynamic_id = 1,
 };
 
 module_usb_driver(usbat_driver);