[RFT/PATCH 33/38] usb: dwc3: gadget: split dwc3_gadget_ep_cleanup_completed_requests()

[Felipe Balbi]

No functional changes, it just makes the code slightly easier to read.

Signed-off-by: Felipe Balbi <felipe.ba...@linux.intel.com>
---
 drivers/usb/dwc3/gadget.c | 60 ++++++++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index c515104ba86d..79d0e48c612b 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2283,6 +2283,40 @@ static bool dwc3_gadget_ep_request_completed(struct 
dwc3_request *req)
        return req->request.actual == req->request.length;
 }
 
+static int dwc3_gadget_ep_cleanup_completed_request(struct dwc3_ep *dep,
+               const struct dwc3_event_depevt *event,
+               struct dwc3_request *req, int status)
+{
+       int ret;
+
+       if (req->num_pending_sgs)
+               ret = dwc3_gadget_ep_reclaim_trb_sg(dep, req, event,
+                               status);
+       else
+               ret = dwc3_gadget_ep_reclaim_trb_linear(dep, req, event,
+                               status);
+
+       if (req->unaligned || req->zero) {
+               ret = dwc3_gadget_ep_reclaim_trb_linear(dep, req, event,
+                               status);
+               req->unaligned = false;
+               req->zero = false;
+       }
+
+       req->request.actual = req->request.length - req->remaining;
+
+       if (!dwc3_gadget_ep_request_completed(req) &&
+                       req->num_pending_sgs) {
+               __dwc3_gadget_kick_transfer(dep);
+               goto out;
+       }
+
+       dwc3_gadget_giveback(dep, req, status);
+
+out:
+       return ret;
+}
+
 static void dwc3_gadget_ep_cleanup_completed_requests(struct dwc3_ep *dep,
                const struct dwc3_event_depevt *event, int status)
 {
@@ -2292,30 +2326,8 @@ static void 
dwc3_gadget_ep_cleanup_completed_requests(struct dwc3_ep *dep,
        list_for_each_entry_safe(req, tmp, &dep->started_list, list) {
                int ret;
 
-               if (req->num_pending_sgs)
-                       ret = dwc3_gadget_ep_reclaim_trb_sg(dep, req, event,
-                                       status);
-               else
-                       ret = dwc3_gadget_ep_reclaim_trb_linear(dep, req, event,
-                                       status);
-
-               if (req->unaligned || req->zero) {
-                       ret = dwc3_gadget_ep_reclaim_trb_linear(dep, req, event,
-                                       status);
-                       req->unaligned = false;
-                       req->zero = false;
-               }
-
-               req->request.actual = req->request.length - req->remaining;
-
-               if (!dwc3_gadget_ep_request_completed(req) &&
-                               req->num_pending_sgs) {
-                       __dwc3_gadget_kick_transfer(dep);
-                       break;
-               }
-
-               dwc3_gadget_giveback(dep, req, status);
-
+               ret = dwc3_gadget_ep_cleanup_completed_request(dep, event,
+                               req, status);
                if (ret)
                        break;
        }
-- 
2.16.1

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html