usb: dwc3: remove dwc3_gadget_init_hw_endpoints

A previous patch in the series reduces the number of  callsites of
dwc3_gadget_init_hw_endpoints from two to one. This patch removes the
redundant step of wrappering one function in the other, which can be done
by adding a parameter to dwc3_gadget_init_endpoints and moving the
linked-list initialization of dwc->gadet.ep_list.

Signed-off-by: Bryan O'Donoghue <pure.logic@nexus-software.ie>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index fe4e0ac00f06a100bf3a43d41f68adf40e3edf04..1a90877f8b96e88ca3fa7b93a3992b10c9e1344f 100644 (file)
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2006,11 +2006,13 @@ static const struct usb_gadget_ops dwc3_gadget_ops = {
 
 /* -------------------------------------------------------------------------- */
 
-static int dwc3_gadget_init_hw_endpoints(struct dwc3 *dwc, u8 num)
+static int dwc3_gadget_init_endpoints(struct dwc3 *dwc, u8 num)
 {
        struct dwc3_ep                  *dep;
        u8                              epnum;
 
+       INIT_LIST_HEAD(&dwc->gadget.ep_list);
+
        for (epnum = 0; epnum < num; epnum++) {
                bool                    direction = epnum & 1;
 
@@ -2112,13 +2114,6 @@ static int dwc3_gadget_init_hw_endpoints(struct dwc3 *dwc, u8 num)
        return 0;
 }
 
-static int dwc3_gadget_init_endpoints(struct dwc3 *dwc)
-{
-       INIT_LIST_HEAD(&dwc->gadget.ep_list);
-
-       return dwc3_gadget_init_hw_endpoints(dwc, dwc->num_eps);
-}
-
 static void dwc3_gadget_free_endpoints(struct dwc3 *dwc)
 {
        struct dwc3_ep                  *dep;
@@ -3226,7 +3221,7 @@ int dwc3_gadget_init(struct dwc3 *dwc)
         * sure we're starting from a well known location.
         */
 
-       ret = dwc3_gadget_init_endpoints(dwc);
+       ret = dwc3_gadget_init_endpoints(dwc, dwc->num_eps);
        if (ret)
                goto err6;