diff options
| author | Felipe Balbi <felipe.balbi@linux.intel.com> | 2024-04-12 22:26:01 +0200 |
|---|---|---|
| committer | Mattijs Korpershoek <mkorpershoek@baylibre.com> | 2024-05-16 08:38:24 +0200 |
| commit | 13395507ca1f48de25e70f4d27f709b1a4fa0a82 (patch) | |
| tree | 51092202616cfc0d89c391eceb56823d54de2a2b | |
| parent | 371b379edbf3488d77bc321dc5d2a0e22e067744 (diff) | |
| download | u-boot-13395507ca1f48de25e70f4d27f709b1a4fa0a82.zip u-boot-13395507ca1f48de25e70f4d27f709b1a4fa0a82.tar.gz u-boot-13395507ca1f48de25e70f4d27f709b1a4fa0a82.tar.bz2 | |
usb: dwc3: gadget: combine return points into a single one
Upstream Linux commit c0ca324d09a0.
dwc3_send_gadget_ep_cmd() had three return
points. That becomes a pain to track when we need to
debug something or if we need to add more code
before returning.
Let's combine all three return points into a single
one just by introducing a local 'ret' variable.
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@siemens.com>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Link: https://lore.kernel.org/r/20240412202611.3565052-2-alexander.sverdlin@siemens.com
Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
| -rw-r--r-- | drivers/usb/dwc3/gadget.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 4de007c..b4cc238 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -301,6 +301,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep, { u32 timeout = 500; u32 reg; + int ret = -EINVAL; dwc3_writel(dwc->regs, DWC3_DEPCMDPAR0(ep), params->param0); dwc3_writel(dwc->regs, DWC3_DEPCMDPAR1(ep), params->param1); @@ -312,7 +313,8 @@ int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep, if (!(reg & DWC3_DEPCMD_CMDACT)) { dev_vdbg(dwc->dev, "Command Complete --> %d\n", DWC3_DEPCMD_STATUS(reg)); - return 0; + ret = 0; + break; } /* @@ -320,11 +322,15 @@ int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep, * interrupt context. */ timeout--; - if (!timeout) - return -ETIMEDOUT; + if (!timeout) { + ret = -ETIMEDOUT; + break; + } udelay(1); } while (1); + + return ret; } static dma_addr_t dwc3_trb_dma_offset(struct dwc3_ep *dep, |