Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752840AbbHEMDj (ORCPT ); Wed, 5 Aug 2015 08:03:39 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:49459 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752544AbbHEMCg (ORCPT ); Wed, 5 Aug 2015 08:02:36 -0400 X-AuditID: cbfee61b-f79706d000001b96-ac-55c1fb5b670f From: Robert Baldyga To: balbi@ti.com Cc: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Robert Baldyga Subject: [PATCH v6 5/8] usb: gadget: net2280: add net2280_match_ep() function Date: Wed, 05 Aug 2015 14:02:07 +0200 Message-id: <1438776130-29716-6-git-send-email-r.baldyga@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1438776130-29716-1-git-send-email-r.baldyga@samsung.com> References: <1438776130-29716-1-git-send-email-r.baldyga@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpjluLIzCtJLcpLzFFi42I5/e+xgG7074OhBh2XpC0O3q+3aF68ns3i 8q45bBaLlrUyWzw4vJPdgdVj/9w17B59W1Yxehy/sZ3J4/MmuQCWKC6blNSczLLUIn27BK6M l5P5Cz5JV0xvm8bWwNgr3sXIySEhYCJx69liJghbTOLCvfVsXYxcHEICSxklLu+YDeX8ZJTo 71nODlLFJqAjseX7BEYQW0RAQGL9i0vsIEXMAo2MEo8etrN2MXJwCAv4Smy9kARSwyKgKvFm 4R4WEJtXwFVi3aFHzBDb5CROHpvMCmJzCrhJHHx2lg3EFgKq+dV2m20CI+8CRoZVjBKpBckF xUnpuUZ5qeV6xYm5xaV56XrJ+bmbGMGh80x6B+PhXe6HGAU4GJV4eD84HwwVYk0sK67MPcQo wcGsJMK77gdQiDclsbIqtSg/vqg0J7X4EKM0B4uSOK++yaZQIYH0xJLU7NTUgtQimCwTB6dU A+MK1zajV+vlZ21IFDD5/VqR+Z/w1NwnDmV3FPn26HcGS53Juq8Ruyx9yvW/n4xOH14b33Xs i+3byyE1T43e1fvb77N74Lnp/O3OCwHG7TNP37B7XBD148rbv59v3aj8FJqzqV7596o63+tx LBPdl+qGWn8KPDvnoupCz2ORZ6onHtgtZOgUViugxFKckWioxVxUnAgAxlENrBkCAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3718 Lines: 102 Add 'match_ep' callback to utilize chip-specific knowledge in endpoint matching process. Function does the same that was done by chip-specific code inside of epautoconf. Now this code can be removed from there to separate generic code from platform specific logic. Signed-off-by: Robert Baldyga --- drivers/usb/gadget/epautoconf.c | 23 +---------------------- drivers/usb/gadget/udc/net2280.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c index a39ca03..0ff5134 100644 --- a/drivers/usb/gadget/epautoconf.c +++ b/drivers/usb/gadget/epautoconf.c @@ -86,28 +86,7 @@ struct usb_ep *usb_ep_autoconfig_ss( /* First, apply chip-specific "best usage" knowledge. * This might make a good usb_gadget_ops hook ... */ - if (gadget_is_net2280(gadget)) { - char name[8]; - - if (type == USB_ENDPOINT_XFER_INT) { - /* ep-e, ep-f are PIO with only 64 byte fifos */ - ep = gadget_find_ep_by_name(gadget, "ep-e"); - if (ep && usb_gadget_ep_match_desc(gadget, - ep, desc, ep_comp)) - goto found_ep; - ep = gadget_find_ep_by_name(gadget, "ep-f"); - if (ep && usb_gadget_ep_match_desc(gadget, - ep, desc, ep_comp)) - goto found_ep; - } - - /* USB3380: use same address for usb and hardware endpoints */ - snprintf(name, sizeof(name), "ep%d%s", usb_endpoint_num(desc), - usb_endpoint_dir_in(desc) ? "in" : "out"); - ep = gadget_find_ep_by_name(gadget, name); - if (ep && usb_gadget_ep_match_desc(gadget, ep, desc, ep_comp)) - goto found_ep; - } else if (gadget_is_goku (gadget)) { + if (gadget_is_goku(gadget)) { if (USB_ENDPOINT_XFER_INT == type) { /* single buffering is enough */ ep = gadget_find_ep_by_name(gadget, "ep3-bulk"); diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c index 872ca25..9d7eac1 100644 --- a/drivers/usb/gadget/udc/net2280.c +++ b/drivers/usb/gadget/udc/net2280.c @@ -1550,6 +1550,36 @@ static int net2280_pullup(struct usb_gadget *_gadget, int is_on) return 0; } +static struct usb_ep *net2280_match_ep(struct usb_gadget *_gadget, + struct usb_endpoint_descriptor *desc, + struct usb_ss_ep_comp_descriptor *ep_comp) +{ + char name[8]; + struct usb_ep *ep; + u8 type; + + type = usb_endpoint_type(desc); + + if (type == USB_ENDPOINT_XFER_INT) { + /* ep-e, ep-f are PIO with only 64 byte fifos */ + ep = gadget_find_ep_by_name(_gadget, "ep-e"); + if (ep && usb_gadget_ep_match_desc(_gadget, ep, desc, ep_comp)) + return ep; + ep = gadget_find_ep_by_name(_gadget, "ep-f"); + if (ep && usb_gadget_ep_match_desc(_gadget, ep, desc, ep_comp)) + return ep; + } + + /* USB3380: use same address for usb and hardware endpoints */ + snprintf(name, sizeof(name), "ep%d%s", usb_endpoint_num(desc), + usb_endpoint_dir_in(desc) ? "in" : "out"); + ep = gadget_find_ep_by_name(_gadget, name); + if (ep && usb_gadget_ep_match_desc(_gadget, ep, desc, ep_comp)) + return ep; + + return NULL; +} + static int net2280_start(struct usb_gadget *_gadget, struct usb_gadget_driver *driver); static int net2280_stop(struct usb_gadget *_gadget); @@ -1561,6 +1591,7 @@ static const struct usb_gadget_ops net2280_ops = { .pullup = net2280_pullup, .udc_start = net2280_start, .udc_stop = net2280_stop, + .match_ep = net2280_match_ep, }; /*-------------------------------------------------------------------------*/ -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/