usb: gadget: chips: remove ifdef trickery

the gadget controller number is only used
during bind() to update descriptors and/or
check that a particular controller can support
a particular gadget driver.

Because of that, we can remove the ifdef
trickery as it's a rather small optimization
anyway.

While at that, also sort the entries
alphabetically and add a comment stating we
want to keep the list ordered alphabetically.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 33 insertions, 149 deletions

diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
index 13c2f9e94405..f3a83cd0ef50 100644
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -15,156 +15,40 @@
 #ifndef __GADGET_CHIPS_H
 #define __GADGET_CHIPS_H
 
-#ifdef CONFIG_USB_GADGET_NET2272
-#define gadget_is_net2272(g)    !strcmp("net2272", (g)->name)
-#else
-#define gadget_is_net2272(g)    0
-#endif
-
-#ifdef CONFIG_USB_GADGET_NET2280
-#define gadget_is_net2280(g)    !strcmp("net2280", (g)->name)
-#else
-#define gadget_is_net2280(g)    0
-#endif
-
-#ifdef CONFIG_USB_GADGET_AMD5536UDC
-#define gadget_is_amd5536udc(g) !strcmp("amd5536udc", (g)->name)
-#else
-#define gadget_is_amd5536udc(g) 0
-#endif
-
-#ifdef CONFIG_USB_GADGET_DUMMY_HCD
-#define gadget_is_dummy(g)      !strcmp("dummy_udc", (g)->name)
-#else
-#define gadget_is_dummy(g)      0
-#endif
-
-#ifdef CONFIG_USB_GADGET_PXA25X
-#define gadget_is_pxa(g)        !strcmp("pxa25x_udc", (g)->name)
-#else
-#define gadget_is_pxa(g)        0
-#endif
-
-#ifdef CONFIG_USB_GADGET_GOKU
-#define gadget_is_goku(g)       !strcmp("goku_udc", (g)->name)
-#else
-#define gadget_is_goku(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
-
-/* various unstable versions available */
-#ifdef CONFIG_USB_GADGET_PXA27X
-#define gadget_is_pxa27x(g)     !strcmp("pxa27x_udc", (g)->name)
-#else
-#define gadget_is_pxa27x(g)     0
-#endif
-
-#ifdef CONFIG_USB_GADGET_ATMEL_USBA
-#define gadget_is_atmel_usba(g) !strcmp("atmel_usba_udc", (g)->name)
-#else
-#define gadget_is_atmel_usba(g) 0
-#endif
-
-#ifdef CONFIG_USB_GADGET_S3C2410
-#define gadget_is_s3c2410(g)    !strcmp("s3c2410_udc", (g)->name)
-#else
-#define gadget_is_s3c2410(g)    0
-#endif
-
-#ifdef CONFIG_USB_GADGET_AT91
-#define gadget_is_at91(g)       !strcmp("at91_udc", (g)->name)
-#else
-#define gadget_is_at91(g)       0
-#endif
-
-#ifdef CONFIG_USB_GADGET_IMX
-#define gadget_is_imx(g)        !strcmp("imx_udc", (g)->name)
-#else
-#define gadget_is_imx(g)        0
-#endif
-
-#ifdef CONFIG_USB_GADGET_FSL_USB2
-#define gadget_is_fsl_usb2(g)   !strcmp("fsl-usb2-udc", (g)->name)
-#else
-#define gadget_is_fsl_usb2(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)
-#else
-#define gadget_is_musbhdrc(g)   0
-#endif
-
-#ifdef CONFIG_USB_GADGET_LANGWELL
-#define gadget_is_langwell(g)   (!strcmp("langwell_udc", (g)->name))
-#else
-#define gadget_is_langwell(g)   0
-#endif
-
-#ifdef CONFIG_USB_GADGET_M66592
-#define gadget_is_m66592(g)     !strcmp("m66592_udc", (g)->name)
-#else
-#define gadget_is_m66592(g)     0
-#endif
-
-/* Freescale CPM/QE UDC SUPPORT */
-#ifdef CONFIG_USB_GADGET_FSL_QE
-#define gadget_is_fsl_qe(g)     !strcmp("fsl_qe_udc", (g)->name)
-#else
-#define gadget_is_fsl_qe(g)     0
-#endif
-
-#ifdef CONFIG_USB_GADGET_CI13XXX_PCI
-#define gadget_is_ci13xxx_pci(g)        (!strcmp("ci13xxx_pci", (g)->name))
-#else
-#define gadget_is_ci13xxx_pci(g)        0
-#endif
-
-// CONFIG_USB_GADGET_SX2
-// CONFIG_USB_GADGET_AU1X00
-// ...
-
-#ifdef CONFIG_USB_GADGET_R8A66597
-#define gadget_is_r8a66597(g)   !strcmp("r8a66597_udc", (g)->name)
-#else
-#define gadget_is_r8a66597(g)   0
-#endif
-
-#ifdef CONFIG_USB_S3C_HSOTG
-#define gadget_is_s3c_hsotg(g)    (!strcmp("s3c-hsotg", (g)->name))
-#else
-#define gadget_is_s3c_hsotg(g)    0
-#endif
-
-#ifdef CONFIG_USB_S3C_HSUDC
-#define gadget_is_s3c_hsudc(g) (!strcmp("s3c-hsudc", (g)->name))
-#else
-#define gadget_is_s3c_hsudc(g) 0
-#endif
-
-#ifdef CONFIG_USB_GADGET_EG20T
-#define gadget_is_pch(g)        (!strcmp("pch_udc", (g)->name))
-#else
-#define gadget_is_pch(g)        0
-#endif
-
-#ifdef CONFIG_USB_GADGET_CI13XXX_MSM
+/*
+ * NOTICE: the entries below are alphabetical and should be kept
+ * that way.
+ *
+ * Always be sure to add new entries to the correct position or
+ * accept the bashing later.
+ *
+ * If you have forgotten the alphabetical order let VIM/EMACS
+ * do that for you.
+ */
+#define gadget_is_amd5536udc(g)         (!strcmp("amd5536udc", (g)->name))
+#define gadget_is_at91(g)               (!strcmp("at91_udc", (g)->name))
+#define gadget_is_atmel_usba(g)         (!strcmp("atmel_usba_udc", (g)->name))
 #define gadget_is_ci13xxx_msm(g)        (!strcmp("ci13xxx_msm", (g)->name))
-#else
-#define gadget_is_ci13xxx_msm(g)        0
-#endif
-
-#ifdef CONFIG_USB_GADGET_RENESAS_USBHS
-#define gadget_is_renesas_usbhs(g) (!strcmp("renesas_usbhs_udc", (g)->name))
-#else
-#define gadget_is_renesas_usbhs(g) 0
-#endif
+#define gadget_is_ci13xxx_pci(g)        (!strcmp("ci13xxx_pci", (g)->name))
+#define gadget_is_dummy(g)              (!strcmp("dummy_udc", (g)->name))
+#define gadget_is_fsl_qe(g)             (!strcmp("fsl_qe_udc", (g)->name))
+#define gadget_is_fsl_usb2(g)           (!strcmp("fsl-usb2-udc", (g)->name))
+#define gadget_is_goku(g)               (!strcmp("goku_udc", (g)->name))
+#define gadget_is_imx(g)                (!strcmp("imx_udc", (g)->name))
+#define gadget_is_langwell(g)           (!strcmp("langwell_udc", (g)->name))
+#define gadget_is_m66592(g)             (!strcmp("m66592_udc", (g)->name))
+#define gadget_is_musbhdrc(g)           (!strcmp("musb-hdrc", (g)->name))
+#define gadget_is_net2272(g)            (!strcmp("net2272", (g)->name))
+#define gadget_is_net2280(g)            (!strcmp("net2280", (g)->name))
+#define gadget_is_omap(g)               (!strcmp("omap_udc", (g)->name))
+#define gadget_is_pch(g)                (!strcmp("pch_udc", (g)->name))
+#define gadget_is_pxa(g)                (!strcmp("pxa25x_udc", (g)->name))
+#define gadget_is_pxa27x(g)             (!strcmp("pxa27x_udc", (g)->name))
+#define gadget_is_r8a66597(g)           (!strcmp("r8a66597_udc", (g)->name))
+#define gadget_is_renesas_usbhs(g)      (!strcmp("renesas_usbhs_udc", (g)->name))
+#define gadget_is_s3c2410(g)            (!strcmp("s3c2410_udc", (g)->name))
+#define gadget_is_s3c_hsotg(g)          (!strcmp("s3c-hsotg", (g)->name))
+#define gadget_is_s3c_hsudc(g)          (!strcmp("s3c-hsudc", (g)->name))
 
 /**
  * usb_gadget_controller_number - support bcdDevice id convention