usb: gadget: ux500: Do not redefine ops if CONFIG_USB_MUSB_HOST set

In case CONFIG_USB_MUSB_HOST is set, the ux500_gadget_ops get overridden
to musb_usb_ops . Simply set the ops one way or the other depending on
whether CONFIG_USB_MUSB_HOST is set or not.

Fixes: ac4bf5d48a9e ("usb: gadget: ux500: Convert interrupt handling to usb_gadget_generic_ops")
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Link: https://lore.kernel.org/r/20240818200425.89045-1-marek.vasut+renesas@mailbox.org
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

diff --git a/drivers/usb/musb-new/ux500.c b/drivers/usb/musb-new/ux500.c
index 89dd75b7d057bba0739a922c5af0d31ba75cce44..be0085f403d4604b8e3309c54bfc0e9458a203c0 100644 (file)
--- a/drivers/usb/musb-new/ux500.c
+++ b/drivers/usb/musb-new/ux500.c
@@ -169,16 +169,14 @@ U_BOOT_DRIVER(ux500_musb) = {
        .name           = "ux500-musb",
 #ifdef CONFIG_USB_MUSB_HOST
        .id             = UCLASS_USB,
+       .ops            = &musb_usb_ops,
 #else
        .id             = UCLASS_USB_GADGET_GENERIC,
+       .ops            = &ux500_gadget_ops,
 #endif
        .of_match       = ux500_musb_ids,
-       .ops            = &ux500_gadget_ops,
        .probe          = ux500_musb_probe,
        .remove         = ux500_musb_remove,
-#ifdef CONFIG_USB_MUSB_HOST
-       .ops            = &musb_usb_ops,
-#endif
        .plat_auto      = sizeof(struct usb_plat),
        .priv_auto      = sizeof(struct ux500_glue),
 };