Commit 8411993e authored by Thinh Nguyen's avatar Thinh Nguyen Committed by Felipe Balbi

usb: dwc3: gadget: Remove unnecessary checks

Remove 2 unnecessary checks:
1) A request in the started_list must have its trb field set. So
checking for req->trb is unnecessary.

2) An endpoint must have started (and have not ended) for the request to
still be in the started_list. There's no point to check if the endpoint
is started. We had this check because previously the driver didn't
handle the endpoint's started/ended flags for END_TRANSFER command
properly. See commit 9f45581f ("usb: dwc3: gadget: early giveback
if End Transfer already completed").
Signed-off-by: default avatarThinh Nguyen <thinhn@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
parent a7027ca6
...@@ -1581,9 +1581,6 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep, ...@@ -1581,9 +1581,6 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,
/* wait until it is processed */ /* wait until it is processed */
dwc3_stop_active_transfer(dep, true, true); dwc3_stop_active_transfer(dep, true, true);
if (!r->trb)
goto out0;
/* /*
* Remove any started request if the transfer is * Remove any started request if the transfer is
* cancelled. * cancelled.
...@@ -1591,10 +1588,7 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep, ...@@ -1591,10 +1588,7 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,
list_for_each_entry_safe(r, t, &dep->started_list, list) list_for_each_entry_safe(r, t, &dep->started_list, list)
dwc3_gadget_move_cancelled_request(r); dwc3_gadget_move_cancelled_request(r);
if (dep->flags & DWC3_EP_TRANSFER_STARTED) goto out0;
goto out0;
else
goto out1;
} }
dev_err(dwc->dev, "request %pK was not queued to %s\n", dev_err(dwc->dev, "request %pK was not queued to %s\n",
request, ep->name); request, ep->name);
...@@ -1602,7 +1596,6 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep, ...@@ -1602,7 +1596,6 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,
goto out0; goto out0;
} }
out1:
dwc3_gadget_giveback(dep, req, -ECONNRESET); dwc3_gadget_giveback(dep, req, -ECONNRESET);
out0: out0:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment