lkml.org 
[lkml]   [2015]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 26/26] usb: gadget: legacy: tcm: eliminate abuse of ep->driver data
    Date
    Since ep->driver_data is not used for endpoint claiming, neither for
    enabled/disabled state storing, we can reduce number of places where
    we read or modify it's value, as now it has no particular meaning for
    function or framework logic.

    In case of tcm, ep->driver_data was used only for endpoint claiming so
    we can simplify code by reducing it. We also remove give_back_ep()
    function which is not needed after all - when error code is returned
    from bind() function, composite will release all endpoints anyway.

    Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
    ---
    drivers/usb/gadget/legacy/tcm_usb_gadget.c | 18 ------------------
    1 file changed, 18 deletions(-)

    diff --git a/drivers/usb/gadget/legacy/tcm_usb_gadget.c b/drivers/usb/gadget/legacy/tcm_usb_gadget.c
    index c3c4808..778e42a 100644
    --- a/drivers/usb/gadget/legacy/tcm_usb_gadget.c
    +++ b/drivers/usb/gadget/legacy/tcm_usb_gadget.c
    @@ -2018,14 +2018,6 @@ static struct usb_configuration usbg_config_driver = {
    .bmAttributes = USB_CONFIG_ATT_SELFPOWER,
    };

    -static void give_back_ep(struct usb_ep **pep)
    -{
    - struct usb_ep *ep = *pep;
    - if (!ep)
    - return;
    - ep->driver_data = NULL;
    -}
    -
    static int usbg_bind(struct usb_configuration *c, struct usb_function *f)
    {
    struct f_uas *fu = to_f_uas(f);
    @@ -2045,29 +2037,24 @@ static int usbg_bind(struct usb_configuration *c, struct usb_function *f)
    &uasp_bi_ep_comp_desc);
    if (!ep)
    goto ep_fail;
    -
    - ep->driver_data = fu;
    fu->ep_in = ep;

    ep = usb_ep_autoconfig_ss(gadget, &uasp_ss_bo_desc,
    &uasp_bo_ep_comp_desc);
    if (!ep)
    goto ep_fail;
    - ep->driver_data = fu;
    fu->ep_out = ep;

    ep = usb_ep_autoconfig_ss(gadget, &uasp_ss_status_desc,
    &uasp_status_in_ep_comp_desc);
    if (!ep)
    goto ep_fail;
    - ep->driver_data = fu;
    fu->ep_status = ep;

    ep = usb_ep_autoconfig_ss(gadget, &uasp_ss_cmd_desc,
    &uasp_cmd_comp_desc);
    if (!ep)
    goto ep_fail;
    - ep->driver_data = fu;
    fu->ep_cmd = ep;

    /* Assume endpoint addresses are the same for both speeds */
    @@ -2091,11 +2078,6 @@ static int usbg_bind(struct usb_configuration *c, struct usb_function *f)
    return 0;
    ep_fail:
    pr_err("Can't claim all required eps\n");
    -
    - give_back_ep(&fu->ep_in);
    - give_back_ep(&fu->ep_out);
    - give_back_ep(&fu->ep_status);
    - give_back_ep(&fu->ep_cmd);
    return -ENOTSUPP;
    }

    --
    1.9.1


    \
     
     \ /
      Last update: 2015-09-16 12:41    [W:4.185 / U:0.352 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site