[PATCH] dropping remainings of half-dead usb gadget drivers

From: Christoph Egger
Date: Fri Jan 15 2010 - 08:13:15 EST

This patch dropps 5 CONFIG_USB_GADGET items that haven't been
accessible for a long time (waiting to be ported from 2.4 to 2.6,
maybe relating to external trees with no activity in the last 2 years
etc). If one of these really shows up again it should be
straigt-forward to add them again.

This doesn't change USB IDs assigned to USB gadget drivers which
causes some holes in the ID namespace but changing public identifiers
isn't that good of an idea.

Signed-off-by: Christoph Egger <siccegge@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
drivers/usb/gadget/gadget_chips.h | 46 -------------------------------------
1 files changed, 0 insertions(+), 46 deletions(-)

diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
index f2d270b..b1bca51 100644
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -45,46 +45,18 @@
#define gadget_is_goku(g) 0

-/* SH3 UDC -- not yet ported 2.4 --> 2.6 */
-#define gadget_is_sh(g) !strcmp("sh_udc", (g)->name)
-#define gadget_is_sh(g) 0
-/* not yet stable on 2.6 (would help "original Zaurus") */
-#define gadget_is_sa1100(g) !strcmp("sa1100_udc", (g)->name)
-#define gadget_is_sa1100(g) 0
#define gadget_is_lh7a40x(g) !strcmp("lh7a40x_udc", (g)->name)
#define gadget_is_lh7a40x(g) 0

-/* handhelds.org tree (?) */
-#define gadget_is_mq11xx(g) !strcmp("mq11xx_udc", (g)->name)
-#define gadget_is_mq11xx(g) 0
#define gadget_is_omap(g) !strcmp("omap_udc", (g)->name)
#define gadget_is_omap(g) 0

-/* not yet ported 2.4 --> 2.6 */
-#define gadget_is_n9604(g) !strcmp("n9604_udc", (g)->name)
-#define gadget_is_n9604(g) 0
/* various unstable versions available */
#define gadget_is_pxa27x(g) !strcmp("pxa27x_udc", (g)->name)
@@ -122,14 +94,6 @@
#define gadget_is_fsl_usb2(g) 0

-/* Mentor high speed function controller */
-/* from Montavista kernel (?) */
-#define gadget_is_musbhsfc(g) !strcmp("musbhsfc_udc", (g)->name)
-#define gadget_is_musbhsfc(g) 0
/* Mentor high speed "dual role" controller, in peripheral role */
#define gadget_is_musbhdrc(g) !strcmp("musb_hdrc", (g)->name)
@@ -203,20 +167,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,8 +181,6 @@ 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))

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/