mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-24 04:34:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

usb: dwc3: gadget: combine return points into a single one

Browse Source 
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>
This commit is contained in:
Felipe Balbi 2024-04-12 22:26:01 +02:00 committed by Mattijs Korpershoek
parent 371b379edb
commit 13395507ca
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/dwc3/gadget.c
View File

@ -301,6 +301,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep,
{ {
u32 timeout = 500; u32 timeout = 500;
u32 reg; u32 reg;
int ret = -EINVAL;
dwc3_writel(dwc->regs, DWC3_DEPCMDPAR0(ep), params->param0); dwc3_writel(dwc->regs, DWC3_DEPCMDPAR0(ep), params->param0);
dwc3_writel(dwc->regs, DWC3_DEPCMDPAR1(ep), params->param1); 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)) { if (!(reg & DWC3_DEPCMD_CMDACT)) {
dev_vdbg(dwc->dev, "Command Complete --> %d\n", dev_vdbg(dwc->dev, "Command Complete --> %d\n",
DWC3_DEPCMD_STATUS(reg)); 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. * interrupt context.
*/ */
timeout--; timeout--;
if (!timeout) if (!timeout) {
return -ETIMEDOUT; ret = -ETIMEDOUT;
break;
}
udelay(1); udelay(1);
} while (1); } while (1);
return ret;
} }
static dma_addr_t dwc3_trb_dma_offset(struct dwc3_ep *dep, static dma_addr_t dwc3_trb_dma_offset(struct dwc3_ep *dep,