usb: dwc3: gadget: initialize transfer index from send_gadget_ep_cmd()

Instead of *always* calling dwc3_gadget_ep_get_transfer_index() after
sending a Start Transfer command, we can call it once from
dwc3_send_gadget_ep_cmd() itself.

Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index b587ae14f77377ea8753567c2bb7e360fcc9d51b..c77ff50a88a2c5c44910b02fa88189a23491fab2 100644 (file)
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -79,7 +79,6 @@ static int dwc3_ep0_start_trans(struct dwc3_ep *dep)
        if (ret < 0)
                return ret;
 
-       dwc3_gadget_ep_get_transfer_index(dep);
        dwc->ep0_next_event = DWC3_EP0_COMPLETE;
 
        return 0;

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 9e4db9cdb95e97a9f8ea0e6b4171521c2b4655b6..cca692e0bfd8a58ecc4e0b77b1032213efa14c3b 100644 (file)
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -378,6 +378,7 @@ int dwc3_send_gadget_ep_cmd(struct dwc3_ep *dep, unsigned cmd,
                switch (DWC3_DEPCMD_CMD(cmd)) {
                case DWC3_DEPCMD_STARTTRANSFER:
                        dep->flags |= DWC3_EP_TRANSFER_STARTED;
+                       dwc3_gadget_ep_get_transfer_index(dep);
                        break;
                case DWC3_DEPCMD_ENDTRANSFER:
                        dep->flags &= ~DWC3_EP_TRANSFER_STARTED;
@@ -682,8 +683,6 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep, unsigned int action)
                ret = dwc3_send_gadget_ep_cmd(dep, cmd, &params);
                if (ret < 0)
                        return ret;
-
-               dwc3_gadget_ep_get_transfer_index(dep);
        }
 
 out:
@@ -1244,9 +1243,6 @@ static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep)
                return ret;
        }
 
-       if (starting)
-               dwc3_gadget_ep_get_transfer_index(dep);
-
        return 0;
 }