Hi Alexander,
Thank you for the patch.
On ven., avril 12, 2024 at 22:26, "A. Sverdlin"
<alexander.sverd...@siemens.com> wrote:
> From: Felipe Balbi <felipe.ba...@linux.intel.com>
>
> 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.ba...@linux.intel.com>
> Signed-off-by: Alexander Sverdlin <alexander.sverd...@siemens.com>
Reviewed-by: Mattijs Korpershoek <mkorpersh...@baylibre.com>
> ---
> drivers/usb/dwc3/gadget.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
> index 69d9fe40e2f87..17c19285f1c24 100644
> --- a/drivers/usb/dwc3/gadget.c
> +++ b/drivers/usb/dwc3/gadget.c
> @@ -302,6 +302,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);
> @@ -313,7 +314,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;
> }
>
> /*
> @@ -321,11 +323,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,
> --
> 2.44.0
