usb: udc: dwc3: Fold dwc3_uboot_handle_interrupt into dm_usb_gadget_handle_interrupts

The only call site of dwc3_uboot_handle_interrupt() is the
dm_usb_gadget_handle_interrupts(), fold the former into the
later. This makes dwc3_uboot_handle_interrupt() unavailable
to be called from board code as well.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # vim3
Link: https://lore.kernel.org/r/20240317044357.547037-2-marek.vasut+renesas@mailbox.org
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
This commit is contained in:
Marek Vasut 2024-03-17 05:42:53 +01:00 committed by Mattijs Korpershoek
parent 4d15898089
commit 12ac51cdb7
2 changed files with 11 additions and 17 deletions

View file

@ -988,18 +988,27 @@ MODULE_AUTHOR("Felipe Balbi <balbi@ti.com>");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("DesignWare USB3 DRD Controller Driver"); MODULE_DESCRIPTION("DesignWare USB3 DRD Controller Driver");
#if !CONFIG_IS_ENABLED(DM_USB_GADGET)
__weak int dwc3_uboot_interrupt_status(struct udevice *dev)
{
return 1;
}
/** /**
* dwc3_uboot_handle_interrupt - handle dwc3 core interrupt * dm_usb_gadget_handle_interrupts - handle dwc3 core interrupt
* @dev: device of this controller * @dev: device of this controller
* *
* Invokes dwc3 gadget interrupts. * Invokes dwc3 gadget interrupts.
* *
* Generally called from board file. * Generally called from board file.
*/ */
void dwc3_uboot_handle_interrupt(struct udevice *dev) int dm_usb_gadget_handle_interrupts(struct udevice *dev)
{ {
struct dwc3 *dwc = NULL; struct dwc3 *dwc = NULL;
if (!dwc3_uboot_interrupt_status(dev))
return 0;
list_for_each_entry(dwc, &dwc3_list, list) { list_for_each_entry(dwc, &dwc3_list, list) {
if (dwc->dev != dev) if (dwc->dev != dev)
continue; continue;
@ -1007,20 +1016,6 @@ void dwc3_uboot_handle_interrupt(struct udevice *dev)
dwc3_gadget_uboot_handle_interrupt(dwc); dwc3_gadget_uboot_handle_interrupt(dwc);
break; break;
} }
}
#if !CONFIG_IS_ENABLED(DM_USB_GADGET)
__weak int dwc3_uboot_interrupt_status(struct udevice *dev)
{
return 1;
}
int dm_usb_gadget_handle_interrupts(struct udevice *dev)
{
if (!dwc3_uboot_interrupt_status(dev))
return 0;
dwc3_uboot_handle_interrupt(dev);
return 0; return 0;
} }

View file

@ -45,7 +45,6 @@ struct dwc3_device {
int dwc3_uboot_init(struct dwc3_device *dev); int dwc3_uboot_init(struct dwc3_device *dev);
void dwc3_uboot_exit(int index); void dwc3_uboot_exit(int index);
int dwc3_uboot_interrupt_status(struct udevice *dev); int dwc3_uboot_interrupt_status(struct udevice *dev);
void dwc3_uboot_handle_interrupt(struct udevice *dev);
struct phy; struct phy;
#if CONFIG_IS_ENABLED(PHY) && CONFIG_IS_ENABLED(DM_USB) #if CONFIG_IS_ENABLED(PHY) && CONFIG_IS_ENABLED(DM_USB)