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 19/26] usb: gadget: f_subset: 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 f_subset, ep->driver_data was used only for endpoint claiming
    and marking endpoints as enabled, so we can simplify code by reducing
    it.

    Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
    ---
    drivers/usb/gadget/function/f_subset.c | 10 +---------
    1 file changed, 1 insertion(+), 9 deletions(-)

    diff --git a/drivers/usb/gadget/function/f_subset.c b/drivers/usb/gadget/function/f_subset.c
    index e3dfa67..2e66e62 100644
    --- a/drivers/usb/gadget/function/f_subset.c
    +++ b/drivers/usb/gadget/function/f_subset.c
    @@ -262,7 +262,7 @@ static int geth_set_alt(struct usb_function *f, unsigned intf, unsigned alt)

    /* we know alt == 0, so this is an activation or a reset */

    - if (geth->port.in_ep->driver_data) {
    + if (geth->port.in_ep->enabled) {
    DBG(cdev, "reset cdc subset\n");
    gether_disconnect(&geth->port);
    }
    @@ -343,13 +343,11 @@ geth_bind(struct usb_configuration *c, struct usb_function *f)
    if (!ep)
    goto fail;
    geth->port.in_ep = ep;
    - ep->driver_data = cdev; /* claim */

    ep = usb_ep_autoconfig(cdev->gadget, &fs_subset_out_desc);
    if (!ep)
    goto fail;
    geth->port.out_ep = ep;
    - ep->driver_data = cdev; /* claim */

    /* support all relevant hardware speeds... we expect that when
    * hardware is dual speed, all bulk-capable endpoints work at
    @@ -380,12 +378,6 @@ geth_bind(struct usb_configuration *c, struct usb_function *f)
    return 0;

    fail:
    - /* we might as well release our claims on endpoints */
    - if (geth->port.out_ep)
    - geth->port.out_ep->driver_data = NULL;
    - if (geth->port.in_ep)
    - geth->port.in_ep->driver_data = NULL;
    -
    ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);

    return status;
    --
    1.9.1


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