1 files changed, 11 insertions, 40 deletions

diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 9e4f1c6935a5..c925d9222f53 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -1422,49 +1422,20 @@ static int gs_bind(struct usb_gadget *gadget)
         int ret;
         struct usb_ep *ep;
         struct gs_dev *dev;
+        int gcnum;
 
-        /* device specific */
-        if (gadget_is_net2280(gadget)) {
-                gs_device_desc.bcdDevice =
-                        __constant_cpu_to_le16(GS_VERSION_NUM|0x0001);
-        } else if (gadget_is_pxa(gadget)) {
-                gs_device_desc.bcdDevice =
-                        __constant_cpu_to_le16(GS_VERSION_NUM|0x0002);
-        } else if (gadget_is_sh(gadget)) {
-                gs_device_desc.bcdDevice =
-                        __constant_cpu_to_le16(GS_VERSION_NUM|0x0003);
-                /* sh doesn't support multiple interfaces or configs */
+        /* Some controllers can't support CDC ACM:
+         * - sh doesn't support multiple interfaces or configs;
+         * - sa1100 doesn't have a third interrupt endpoint
+         */
+        if (gadget_is_sh(gadget) || gadget_is_sa1100(gadget))
                 use_acm = 0;
-        } else if (gadget_is_sa1100(gadget)) {
-                gs_device_desc.bcdDevice =
-                        __constant_cpu_to_le16(GS_VERSION_NUM|0x0004);
-                /* sa1100 doesn't support necessary endpoints */
-                use_acm = 0;
-        } else if (gadget_is_goku(gadget)) {
-                gs_device_desc.bcdDevice =
-                        __constant_cpu_to_le16(GS_VERSION_NUM|0x0005);
-        } else if (gadget_is_mq11xx(gadget)) {
-                gs_device_desc.bcdDevice =
-                        __constant_cpu_to_le16(GS_VERSION_NUM|0x0006);
-        } else if (gadget_is_omap(gadget)) {
-                gs_device_desc.bcdDevice =
-                        __constant_cpu_to_le16(GS_VERSION_NUM|0x0007);
-        } else if (gadget_is_lh7a40x(gadget)) {
-                gs_device_desc.bcdDevice =
-                        __constant_cpu_to_le16(GS_VERSION_NUM|0x0008);
-        } else if (gadget_is_n9604(gadget)) {
-                gs_device_desc.bcdDevice =
-                        __constant_cpu_to_le16(GS_VERSION_NUM|0x0009);
-        } else if (gadget_is_pxa27x(gadget)) {
-                gs_device_desc.bcdDevice =
-                        __constant_cpu_to_le16(GS_VERSION_NUM|0x0011);
-        } else if (gadget_is_s3c2410(gadget)) {
-                gs_device_desc.bcdDevice =
-                        __constant_cpu_to_le16(GS_VERSION_NUM|0x0012);
-        } else if (gadget_is_at91(gadget)) {
+
+        gcnum = usb_gadget_controller_number(gadget);
+        if (gcnum >= 0)
                 gs_device_desc.bcdDevice =
-                        __constant_cpu_to_le16(GS_VERSION_NUM|0x0013);
-        } else {
+                                cpu_to_le16(GS_VERSION_NUM | gcnum);
+        else {
                 printk(KERN_WARNING "gs_bind: controller '%s' not recognized\n",
                         gadget->name);
                 /* unrecognized, but safe unless bulk is REALLY quirky */