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 51af2fe..bab8c8f 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 387cbd4..5fe451d 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 15d41f2..35e9c51 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 a6ade40..30532d9 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 fa16157..042cf9e 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 bd55027..31fa24e 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 a19211b..e3b9738 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 e720f8e..a8708ea 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 d75155c..886567a 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 1f62723..ccf271d 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 425df7d..3252a62 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 e4ca5fc..c144078 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 1369d25..fa1ceeb 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);