usb: gadget: Drop all gadget_is_*() functions

The only actually used gadget_is_*() functions are the one for DWC3
used in epautoconf.c usb_ep_autoconfig() and one for MUSB in ether.c.
The DWC3 one should be fixed in some separate patch.

Inline the gadget_is_dwc3() and stop using ifdefs in favor of
IS_ENABLED() macro.

The rest of gadget_is_*() calls in usb_ep_autoconfig() can never
be anything but 0, since those gadgets are not supported in U-Boot,
so remove all that unused code. Remove gadget_chips.h as well.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Tested-by: Alexander Sverdlin <alexander.sverdlin@siemens.com>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # on vim3
Link: https://lore.kernel.org/r/20240609213449.194762-4-marek.vasut+renesas@mailbox.org
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index 0a70035ce04b087d75db871bd64e9cf7d03b58b1..09950ceeaed069f290e970adf7db70392dca588a 100644 (file)
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -12,7 +12,6 @@
 #include <linux/errno.h>
 #include <linux/usb/gadget.h>
 #include <asm/unaligned.h>
-#include "gadget_chips.h"
 
 #define isdigit(c)      ('0' <= (c) && (c) <= '9')
 
@@ -222,41 +221,9 @@ struct usb_ep *usb_ep_autoconfig(
        /* First, apply chip-specific "best usage" knowledge.
         * This might make a good usb_gadget_ops hook ...
         */
-       if (gadget_is_net2280(gadget) && type == USB_ENDPOINT_XFER_INT) {
-               /* ep-e, ep-f are PIO with only 64 byte fifos */
-               ep = find_ep(gadget, "ep-e");
-               if (ep && ep_matches(gadget, ep, desc))
-                       return ep;
-               ep = find_ep(gadget, "ep-f");
-               if (ep && ep_matches(gadget, ep, desc))
-                       return ep;
-
-       } else if (gadget_is_goku(gadget)) {
-               if (USB_ENDPOINT_XFER_INT == type) {
-                       /* single buffering is enough */
-                       ep = find_ep(gadget, "ep3-bulk");
-                       if (ep && ep_matches(gadget, ep, desc))
-                               return ep;
-               } else if (USB_ENDPOINT_XFER_BULK == type
-                               && (USB_DIR_IN & desc->bEndpointAddress)) {
-                       /* DMA may be available */
-                       ep = find_ep(gadget, "ep2-bulk");
-                       if (ep && ep_matches(gadget, ep, desc))
-                               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;
-#ifndef CONFIG_SPL_BUILD
-       } else if (gadget_is_dwc3(gadget)) {
+       if (!IS_ENABLED(CONFIG_SPL_BUILD) &&
+           IS_ENABLED(CONFIG_USB_DWC3_GADGET) &&
+           !strcmp("dwc3-gadget", gadget->name)) {
                const char *name = NULL;
                /*
                 * First try standard, common configuration: ep1in-bulk,
@@ -278,7 +245,6 @@ struct usb_ep *usb_ep_autoconfig(
                        ep = find_ep(gadget, name);
                if (ep && ep_matches(gadget, ep, desc))
                        return ep;
-#endif
        }
 
        if (gadget->ops->match_ep)

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index e76464e121b1cd7c29cc75a4565ee74f5f2bc21c..b7b7bacb00d96021d6f9060ba5cb9141c5c69da0 100644 (file)
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -1989,13 +1989,11 @@ static int eth_bind(struct usb_gadget *gadget)
         * standard protocol is _strongly_ preferred for interop purposes.
         * (By everyone except Microsoft.)
         */
-       if (gadget_is_musbhdrc(gadget)) {
+
+       if (IS_ENABLED(CONFIG_USB_MUSB_GADGET) &&
+           !strcmp("musb-hdrc", gadget->name)) {
                /* reduce tx dma overhead by avoiding special cases */
                zlp = 0;
-       } else if (gadget_is_sh(gadget)) {
-               /* sh doesn't support multiple interfaces or configs */
-               cdc = 0;
-               rndis = 0;
        }
 
        gcnum = (U_BOOT_VERSION_NUM << 4) | U_BOOT_VERSION_NUM_PATCH;

diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
deleted file mode 100644 (file)
index 3160516..0000000
--- a/drivers/usb/gadget/gadget_chips.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * USB device controllers have lots of quirks.  Use these macros in
- * gadget drivers or other code that needs to deal with them, and which
- * autoconfigures instead of using early binding to the hardware.
- *
- * This SHOULD eventually work like the ARM mach_is_*() stuff, driven by
- * some config file that gets updated as new hardware is supported.
- * (And avoiding all runtime comparisons in typical one-choice configs!)
- *
- * NOTE:  some of these controller drivers may not be available yet.
- * Some are available on 2.4 kernels; several are available, but not
- * yet pushed in the 2.6 mainline tree.
- *
- * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and
- *                      Remy Bohmer <linux@bohmer.net>
- */
-#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_GOKU
-#define        gadget_is_goku(g)       (!strcmp("goku_udc", (g)->name))
-#else
-#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
-
-/* 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
-
-#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_AT91
-#define gadget_is_at91(g)      (!strcmp("at91_udc", (g)->name))
-#else
-#define gadget_is_at91(g)      0
-#endif
-
-/* status unclear */
-#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 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_MUSB_GADGET
-#define gadget_is_musbhdrc(g)  (!strcmp("musb-hdrc", (g)->name))
-#else
-#define gadget_is_musbhdrc(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
-
-#ifdef CONFIG_CI_UDC
-#define gadget_is_ci(g)        (!strcmp("ci_udc", (g)->name))
-#else
-#define gadget_is_ci(g)        0
-#endif
-
-#ifdef CONFIG_USB_DWC3_GADGET
-#define gadget_is_dwc3(g)        (!strcmp("dwc3-gadget", (g)->name))
-#else
-#define gadget_is_dwc3(g)        0
-#endif
-
-#ifdef CONFIG_USB_CDNS3_GADGET
-#define gadget_is_cdns3(g)        (!strcmp("cdns3-gadget", (g)->name))
-#else
-#define gadget_is_cdns3(g)        0
-#endif
-
-#ifdef CONFIG_USB_GADGET_MAX3420
-#define gadget_is_max3420(g)        (!strcmp("max3420-udc", (g)->name))
-#else
-#define gadget_is_max3420(g)        0
-#endif
-
-#ifdef CONFIG_USB_MTU3_GADGET
-#define gadget_is_mtu3(g)        (!strcmp("mtu3-gadget", (g)->name))
-#else
-#define gadget_is_mtu3(g)        0
-#endif
-
-#ifdef CONFIG_USB_GADGET_DWC2_OTG
-#define gadget_is_dwc2(g)        (!strcmp("dwc2-udc", (g)->name))
-#else
-#define gadget_is_dwc2(g)        0
-#endif