[PATCH] USB: Gadget library: centralize gadget controller numbers

This patch centralizes the assignment of bcdDevice numbers for different
gadget controllers.  This won't improve the object code at all, but it
does save a lot of repetitive and error-prone source code ... and will
simplify the work of supporting a new controller driver, since most new
gadget drivers will no longer need patches (unless some hardware quirks
limit USB protocol messaging).

Added minor cleanups and identifer hooks for the UDC in the Freescale
iMX series processors.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 7 insertions, 26 deletions

diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 4f57085619b4..a41d9d4baee3 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -3713,6 +3713,7 @@ static void fsg_unbind(struct usb_gadget *gadget)
 static int __init check_parameters(struct fsg_dev *fsg)
 {
         int     prot;
+        int     gcnum;
 
         /* Store the default values */
         mod_data.transport_type = USB_PR_BULK;
@@ -3724,33 +3725,13 @@ static int __init check_parameters(struct fsg_dev *fsg)
                 mod_data.can_stall = 0;
 
         if (mod_data.release == 0xffff) {       // Parameter wasn't set
-                if (gadget_is_net2280(fsg->gadget))
-                        mod_data.release = 0x0301;
-                else if (gadget_is_dummy(fsg->gadget))
-                        mod_data.release = 0x0302;
-                else if (gadget_is_pxa(fsg->gadget))
-                        mod_data.release = 0x0303;
-                else if (gadget_is_sh(fsg->gadget))
-                        mod_data.release = 0x0304;
-
                 /* The sa1100 controller is not supported */
-
-                else if (gadget_is_goku(fsg->gadget))
-                        mod_data.release = 0x0306;
-                else if (gadget_is_mq11xx(fsg->gadget))
-                        mod_data.release = 0x0307;
-                else if (gadget_is_omap(fsg->gadget))
-                        mod_data.release = 0x0308;
-                else if (gadget_is_lh7a40x(fsg->gadget))
-                        mod_data.release = 0x0309;
-                else if (gadget_is_n9604(fsg->gadget))
-                        mod_data.release = 0x0310;
-                else if (gadget_is_pxa27x(fsg->gadget))
-                        mod_data.release = 0x0311;
-                else if (gadget_is_s3c2410(gadget))
-                        mod_data.release = 0x0312;
-                else if (gadget_is_at91(fsg->gadget))
-                        mod_data.release = 0x0313;
+                if (gadget_is_sa1100(fsg->gadget))
+                        gcnum = -1;
+                else
+                        gcnum = usb_gadget_controller_number(fsg->gadget);
+                if (gcnum >= 0)
+                        mod_data.release = 0x0300 + gcnum;
                 else {
                         WARN(fsg, "controller '%s' not recognized\n",
                                 fsg->gadget->name);