USB: Remove unsupported usb gadget drivers

A bunch of USB gadget drivers where never ported from the linux 2.4
series to 2.6 kernels. However there's some code still in the tree for
them which isn't used and is probably untested for ages.

As the chance of these drivers being forward ported is probably quite
small now it might be time to get rid of them.

Signed-off-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index 949ebe5e4c8d8011b8f453ab61b2a6480b6edee9..65a5f94cbc0435153dfe76fda74bc5e4ff3481a5 100644 (file)
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -265,17 +265,6 @@ struct usb_ep * __init usb_ep_autoconfig (
                                return ep;
                }
 
-       } else if (gadget_is_sh (gadget) && USB_ENDPOINT_XFER_INT == type) {
-               /* single buffering is enough; maybe 8 byte fifo is too */
-               ep = find_ep (gadget, "ep3in-bulk");
-               if (ep && ep_matches (gadget, ep, desc))
-                       return ep;
-
-       } else if (gadget_is_mq11xx (gadget) && USB_ENDPOINT_XFER_INT == type) {
-               ep = find_ep (gadget, "ep1-bulk");
-               if (ep && ep_matches (gadget, ep, desc))
-                       return ep;
-
 #ifdef CONFIG_BLACKFIN
        } else if (gadget_is_musbhsfc(gadget) || gadget_is_musbhdrc(gadget)) {
                if ((USB_ENDPOINT_XFER_BULK == type) ||

diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/f_acm.c
index d10353d46b8604f927e4e051e61ff159932c2cc9..e49c7325dce2e8c4eeef62f38b8217febd8b079e 100644 (file)
--- a/drivers/usb/gadget/f_acm.c
+++ b/drivers/usb/gadget/f_acm.c
@@ -702,14 +702,6 @@ acm_unbind(struct usb_configuration *c, struct usb_function *f)
 /* Some controllers can't support CDC ACM ... */
 static inline bool can_support_cdc(struct usb_configuration *c)
 {
-       /* SH3 doesn't support multiple interfaces */
-       if (gadget_is_sh(c->cdev->gadget))
-               return false;
-
-       /* sa1100 doesn't have a third interrupt endpoint */
-       if (gadget_is_sa1100(c->cdev->gadget))
-               return false;
-
        /* everything else is *probably* fine ... */
        return true;
 }

diff --git a/drivers/usb/gadget/f_ecm.c b/drivers/usb/gadget/f_ecm.c
index ecf5bdd0ae069d277e41a26aa613a6dac28678e3..2fff530efc19f163eb466cf2d577cfdc525a5ac1 100644 (file)
--- a/drivers/usb/gadget/f_ecm.c
+++ b/drivers/usb/gadget/f_ecm.c
@@ -497,12 +497,9 @@ static int ecm_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
                        struct net_device       *net;
 
                        /* Enable zlps by default for ECM conformance;
-                        * override for musb_hdrc (avoids txdma ovhead)
-                        * and sa1100 (can't).
+                        * override for musb_hdrc (avoids txdma ovhead).
                         */
-                       ecm->port.is_zlp_ok = !(
-                                  gadget_is_sa1100(cdev->gadget)
-                               || gadget_is_musbhdrc(cdev->gadget)
+                       ecm->port.is_zlp_ok = !(gadget_is_musbhdrc(cdev->gadget)
                                );
                        ecm->port.cdc_filter = DEFAULT_FILTER;
                        DBG(cdev, "activate ecm\n");

diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index e6abde39857d9b9423f37aec367eecf279b85134..b1935fe156a0320769481cf6419c4d58286c52bc 100644 (file)
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -2776,10 +2776,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
        if (cfg->release != 0xffff) {
                i = cfg->release;
        } else {
-               /* The sa1100 controller is not supported */
-               i = gadget_is_sa1100(gadget)
-                       ? -1
-                       : usb_gadget_controller_number(gadget);
+               i = usb_gadget_controller_number(gadget);
                if (i >= 0) {
                        i = 0x0300 + i;
                } else {
@@ -2804,8 +2801,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
         * disable stalls.
         */
        common->can_stall = cfg->can_stall &&
-               !(gadget_is_sh(common->gadget) ||
-                 gadget_is_at91(common->gadget));
+               !(gadget_is_at91(common->gadget));
 
 
        spin_lock_init(&common->lock);

diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
index 95dae4c1ea40d8cabaea0f1698b4f6b16acf847f..a30e60c7f129dc19ec732b51d9b7465ff7e71317 100644 (file)
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -769,10 +769,6 @@ rndis_unbind(struct usb_configuration *c, struct usb_function *f)
 /* Some controllers can't support RNDIS ... */
 static inline bool can_support_rndis(struct usb_configuration *c)
 {
-       /* only two endpoints on sa1100 */
-       if (gadget_is_sa1100(c->cdev->gadget))
-               return false;
-
        /* everything else is *presumably* fine */
        return true;
 }

diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 29dfb0277ffbf5c9d6adcd80d2b68b274401c17d..a90dd2db04889aa5b20fa0f938d367c8cf31c9c7 100644 (file)
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -3208,15 +3208,11 @@ static int __init check_parameters(struct fsg_dev *fsg)
         * halt bulk endpoints correctly.  If one of them is present,
         * disable stalls.
         */
-       if (gadget_is_sh(fsg->gadget) || gadget_is_at91(fsg->gadget))
+       if (gadget_is_at91(fsg->gadget))
                mod_data.can_stall = 0;
 
        if (mod_data.release == 0xffff) {       // Parameter wasn't set
-               /* The sa1100 controller is not supported */
-               if (gadget_is_sa1100(fsg->gadget))
-                       gcnum = -1;
-               else
-                       gcnum = usb_gadget_controller_number(fsg->gadget);
+               gcnum = usb_gadget_controller_number(fsg->gadget);
                if (gcnum >= 0)
                        mod_data.release = 0x0300 + gcnum;
                else {

diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
index f2d270b202f257229cb9120005b7ec3af223191a..1edbc12fff18fdc172cd44627fc8e7d397f0b46c 100644 (file)
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -45,46 +45,18 @@
 #define        gadget_is_goku(g)       0
 #endif
 
-/* SH3 UDC -- not yet ported 2.4 --> 2.6 */
-#ifdef CONFIG_USB_GADGET_SUPERH
-#define        gadget_is_sh(g)         !strcmp("sh_udc", (g)->name)
-#else
-#define        gadget_is_sh(g)         0
-#endif
-
-/* not yet stable on 2.6 (would help "original Zaurus") */
-#ifdef CONFIG_USB_GADGET_SA1100
-#define        gadget_is_sa1100(g)     !strcmp("sa1100_udc", (g)->name)
-#else
-#define        gadget_is_sa1100(g)     0
-#endif
-
 #ifdef CONFIG_USB_GADGET_LH7A40X
 #define        gadget_is_lh7a40x(g)    !strcmp("lh7a40x_udc", (g)->name)
 #else
 #define        gadget_is_lh7a40x(g)    0
 #endif
 
-/* handhelds.org tree (?) */
-#ifdef CONFIG_USB_GADGET_MQ11XX
-#define        gadget_is_mq11xx(g)     !strcmp("mq11xx_udc", (g)->name)
-#else
-#define        gadget_is_mq11xx(g)     0
-#endif
-
 #ifdef CONFIG_USB_GADGET_OMAP
 #define        gadget_is_omap(g)       !strcmp("omap_udc", (g)->name)
 #else
 #define        gadget_is_omap(g)       0
 #endif
 
-/* not yet ported 2.4 --> 2.6 */
-#ifdef CONFIG_USB_GADGET_N9604
-#define        gadget_is_n9604(g)      !strcmp("n9604_udc", (g)->name)
-#else
-#define        gadget_is_n9604(g)      0
-#endif
-
 /* various unstable versions available */
 #ifdef CONFIG_USB_GADGET_PXA27X
 #define        gadget_is_pxa27x(g)     !strcmp("pxa27x_udc", (g)->name)
@@ -122,14 +94,6 @@
 #define gadget_is_fsl_usb2(g)  0
 #endif
 
-/* Mentor high speed function controller */
-/* from Montavista kernel (?) */
-#ifdef CONFIG_USB_GADGET_MUSBHSFC
-#define gadget_is_musbhsfc(g)  !strcmp("musbhsfc_udc", (g)->name)
-#else
-#define gadget_is_musbhsfc(g)  0
-#endif
-
 /* Mentor high speed "dual role" controller, in peripheral role */
 #ifdef CONFIG_USB_GADGET_MUSB_HDRC
 #define gadget_is_musbhdrc(g)  !strcmp("musb_hdrc", (g)->name)
@@ -143,13 +107,6 @@
 #define gadget_is_langwell(g)  0
 #endif
 
-/* from Montavista kernel (?) */
-#ifdef CONFIG_USB_GADGET_MPC8272
-#define gadget_is_mpc8272(g)   !strcmp("mpc8272_udc", (g)->name)
-#else
-#define gadget_is_mpc8272(g)   0
-#endif
-
 #ifdef CONFIG_USB_GADGET_M66592
 #define        gadget_is_m66592(g)     !strcmp("m66592_udc", (g)->name)
 #else
@@ -203,20 +160,12 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget)
                return 0x02;
        else if (gadget_is_pxa(gadget))
                return 0x03;
-       else if (gadget_is_sh(gadget))
-               return 0x04;
-       else if (gadget_is_sa1100(gadget))
-               return 0x05;
        else if (gadget_is_goku(gadget))
                return 0x06;
-       else if (gadget_is_mq11xx(gadget))
-               return 0x07;
        else if (gadget_is_omap(gadget))
                return 0x08;
        else if (gadget_is_lh7a40x(gadget))
                return 0x09;
-       else if (gadget_is_n9604(gadget))
-               return 0x10;
        else if (gadget_is_pxa27x(gadget))
                return 0x11;
        else if (gadget_is_s3c2410(gadget))
@@ -225,12 +174,8 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget)
                return 0x13;
        else if (gadget_is_imx(gadget))
                return 0x14;
-       else if (gadget_is_musbhsfc(gadget))
-               return 0x15;
        else if (gadget_is_musbhdrc(gadget))
                return 0x16;
-       else if (gadget_is_mpc8272(gadget))
-               return 0x17;
        else if (gadget_is_atmel_usba(gadget))
                return 0x18;
        else if (gadget_is_fsl_usb2(gadget))
@@ -265,10 +210,6 @@ static inline bool gadget_supports_altsettings(struct usb_gadget *gadget)
        if (gadget_is_pxa27x(gadget))
                return false;
 
-       /* SH3 hardware just doesn't do altsettings */
-       if (gadget_is_sh(gadget))
-               return false;
-
        /* Everything else is *presumably* fine ... */
        return true;
 }

diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 5f6a2e0a9357bd680182d96b74211ccd8c7f0354..04f6224b7e06b1b65972609f37a8cf7228b43174 100644 (file)
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -618,11 +618,6 @@ gmidi_set_config(struct gmidi_device *dev, unsigned number, gfp_t gfp_flags)
        }
 #endif
 
-       if (gadget_is_sa1100(gadget) && dev->config) {
-               /* tx fifo is full, but we can't clear it...*/
-               ERROR(dev, "can't change configurations\n");
-               return -ESPIPE;
-       }
        gmidi_reset_config(dev);
 
        switch (number) {

diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index 2d867fd22413f9ab0a9af24bacc9aa306cf6df85..6b8bf8c781c4938c123f475baec357b45dbf0c75 100644 (file)
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -949,12 +949,6 @@ printer_set_config(struct printer_dev *dev, unsigned number)
        int                     result = 0;
        struct usb_gadget       *gadget = dev->gadget;
 
-       if (gadget_is_sa1100(gadget) && dev->config) {
-               /* tx fifo is full, but we can't clear it...*/
-               INFO(dev, "can't change configurations\n");
-               return -ESPIPE;
-       }
-
        switch (number) {
        case DEV_CONFIG_VALUE:
                result = 0;
@@ -1033,12 +1027,6 @@ set_interface(struct printer_dev *dev, unsigned number)
 {
        int                     result = 0;
 
-       if (gadget_is_sa1100(dev->gadget) && dev->interface < 0) {
-               /* tx fifo is full, but we can't clear it...*/
-               INFO(dev, "can't change interfaces\n");
-               return -ESPIPE;
-       }
-
        /* Free the current interface */
        switch (dev->interface) {
        case PRINTER_INTERFACE:
@@ -1392,12 +1380,6 @@ printer_bind(struct usb_gadget *gadget)
                goto fail;
        }
 
-       if (gadget_is_sa1100(gadget)) {
-               /* hardware can't write zero length packets. */
-               ERROR(dev, "SA1100 controller is unsupport by this driver\n");
-               goto fail;
-       }
-
        gcnum = usb_gadget_controller_number(gadget);
        if (gcnum >= 0) {
                device_desc.bcdDevice = cpu_to_le16(0x0200 + gcnum);

diff --git a/drivers/usb/gadget/u_ether.h b/drivers/usb/gadget/u_ether.h
index fd55f450bc0e02e88afb55980c12008a073aacb4..3c8c0c9f9d728dd7730ae4335a3f68a410adfbbf 100644 (file)
--- a/drivers/usb/gadget/u_ether.h
+++ b/drivers/usb/gadget/u_ether.h
@@ -93,13 +93,6 @@ static inline bool can_support_ecm(struct usb_gadget *gadget)
        if (!gadget_supports_altsettings(gadget))
                return false;
 
-       /* SA1100 can do ECM, *without* status endpoint ... but we'll
-        * only use it in non-ECM mode for backwards compatibility
-        * (and since we currently require a status endpoint)
-        */
-       if (gadget_is_sa1100(gadget))
-               return false;
-
        /* Everything else is *presumably* fine ... but this is a bit
         * chancy, so be **CERTAIN** there are no hardware issues with
         * your controller.  Add it above if it can't handle CDC.

diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index 2d772401b7ad4879762d118e8ff12231d103a912..fac81ee193dd0100d71bcf344f4badb0d341a153 100644 (file)
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -297,12 +297,10 @@ static int __init zero_bind(struct usb_composite_dev *cdev)
         */
        if (loopdefault) {
                loopback_add(cdev, autoresume != 0);
-               if (!gadget_is_sh(gadget))
-                       sourcesink_add(cdev, autoresume != 0);
+               sourcesink_add(cdev, autoresume != 0);
        } else {
                sourcesink_add(cdev, autoresume != 0);
-               if (!gadget_is_sh(gadget))
-                       loopback_add(cdev, autoresume != 0);
+               loopback_add(cdev, autoresume != 0);
        }
 
        gcnum = usb_gadget_controller_number(gadget);