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

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>
This commit is contained in:
Felipe Balbi 2016-04-04 09:11:51 +03:00
parent e4875bd482
commit c0ca324d09

View File

@ -227,6 +227,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep,
struct dwc3_ep *dep = dwc->eps[ep]; struct dwc3_ep *dep = dwc->eps[ep];
u32 timeout = 500; u32 timeout = 500;
u32 reg; u32 reg;
int ret = -EINVAL;
trace_dwc3_gadget_ep_cmd(dep, cmd, params); trace_dwc3_gadget_ep_cmd(dep, cmd, params);
@ -242,8 +243,9 @@ int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep,
"Command Complete --> %d", "Command Complete --> %d",
DWC3_DEPCMD_STATUS(reg)); DWC3_DEPCMD_STATUS(reg));
if (DWC3_DEPCMD_STATUS(reg)) if (DWC3_DEPCMD_STATUS(reg))
return -EINVAL; break;
return 0; ret = 0;
break;
} }
/* /*
@ -254,11 +256,14 @@ int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep,
if (!timeout) { if (!timeout) {
dwc3_trace(trace_dwc3_gadget, dwc3_trace(trace_dwc3_gadget,
"Command Timed Out"); "Command Timed Out");
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,