From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754517AbbG0JXD (ORCPT ); Mon, 27 Jul 2015 05:23:03 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:52796 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753113AbbG0JXA (ORCPT ); Mon, 27 Jul 2015 05:23:00 -0400 X-AuditID: cbfee61a-f79a06d000005c6f-4a-55b5f86d29c4 From: Robert Baldyga To: balbi@ti.com Cc: gregkh@linuxfoundation.org, Peter.Chen@freescale.com, johnyoun@synopsys.com, dahlmann.thomas@arcor.de, nicolas.ferre@atmel.com, cernekee@gmail.com, leoli@freescale.com, daniel@zonque.org, haojian.zhuang@gmail.com, robert.jarzmik@free.fr, michal.simek@xilinx.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linux-omap@vger.kernel.org, linux-geode@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, andrzej.p@samsung.com, m.szyprowski@samsung.com, stern@rowland.harvard.edu, petr.cvek@tul.cz, Robert Baldyga Subject: [PATCH v4 45/46] usb: gadget: goku_udc: add goku_match_ep() function Date: Mon, 27 Jul 2015 11:16:55 +0200 Message-id: <1437988616-6962-46-git-send-email-r.baldyga@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1437988616-6962-1-git-send-email-r.baldyga@samsung.com> References: <1437988616-6962-1-git-send-email-r.baldyga@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDIsWRmVeSWpSXmKPExsVy+t9jAd3cH1tDDVZ3yVrMetnOYnHwfr3F 3gV3GS067x9mtmj6+4rFYs+ZX+wWzYvXs1lcWGdusfv0JUaLXw+ELDY9vsZq0X/uNIvF5V1z 2CxmL+lnsVi0rJXZ4vf3f6wWa4/cZbd49zLC4tvlZnaLY7P/MlnM75jKavHg8E52i1lvhC0m /L7A5iDhMfnJRiaPBb+2snjc23eYxaN/3WdWj3+H+5k8ds66y+6xf+4ado/NS+o9zs9YyOgx ++4PRo++LasYPbbs/8zocfzGdiaPmSt72Tw+b5Lz2Pv5N0uAYBSXTUpqTmZZapG+XQJXxsPH 1QUrpCq+LNvP2MC4V7SLkZNDQsBEYsPsWWwQtpjEhXvrgWwuDiGBpYwSX7duYIJwfjJKLLg7 nxGkik1AR2LL9wlgtoiAgMT6F5fYQYqYBX6wSJyd180OkhAW8JX4/OczWBGLgKrEp38TwWxe AVeJC8cesUKsk5M4eWwymM0JFF8ybSvQNg6gbS4SR65rTWDkXcDIsIpRIrUguaA4KT3XMC+1 XK84Mbe4NC9dLzk/dxMjOM6eSe1gPLjL/RCjAAejEg/vBZWtoUKsiWXFlbmHGCU4mJVEeB9H AYV4UxIrq1KL8uOLSnNSiw8xSnOwKInzym7YHCokkJ5YkpqdmlqQWgSTZeLglGpgPBeamy5Z LvLab5Xybfe/rT/ztZ96ztIrDmz+uPt3R63T3FVZMoyBBc8FplsFcRlb3vqs+Uv3aySvaV22 Y5VVZewdWzZpkV3db+t1XJOqTnO7TPj/z1H7PE90w2K79Qs2XyxaFf3D2tBPZXphSz/XQr39 nFNjjarDTzs+znrPOWF+s15AaocSS3FGoqEWc1FxIgASwycQrwIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 | 20 ++------------------ drivers/usb/gadget/udc/goku_udc.c | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c index d41fd82..da45371 100644 --- a/drivers/usb/gadget/epautoconf.c +++ b/drivers/usb/gadget/epautoconf.c @@ -86,24 +86,8 @@ 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_goku (gadget)) { - if (USB_ENDPOINT_XFER_INT == type) { - /* single buffering is enough */ - ep = gadget_find_ep_by_name(gadget, "ep3-bulk"); - if (ep && usb_gadget_ep_match_desc(gadget, - ep, desc, ep_comp)) - goto found_ep; - } else if (USB_ENDPOINT_XFER_BULK == type - && (USB_DIR_IN & desc->bEndpointAddress)) { - /* DMA may be available */ - ep = gadget_find_ep_by_name(gadget, "ep2-bulk"); - if (ep && usb_gadget_ep_match_desc(gadget, - ep, desc, ep_comp)) - goto found_ep; - } - #ifdef CONFIG_BLACKFIN - } else if (gadget_is_musbhdrc(gadget)) { + if (gadget_is_musbhdrc(gadget)) { if ((USB_ENDPOINT_XFER_BULK == type) || (USB_ENDPOINT_XFER_ISOC == type)) { if (USB_DIR_IN & desc->bEndpointAddress) @@ -119,8 +103,8 @@ struct usb_ep *usb_ep_autoconfig_ss( ep = NULL; if (ep && usb_gadget_ep_match_desc(gadget, ep, desc, ep_comp)) goto found_ep; -#endif } +#endif /* Second, look at endpoints until an unclaimed one looks usable */ list_for_each_entry (ep, &gadget->ep_list, ep_list) { diff --git a/drivers/usb/gadget/udc/goku_udc.c b/drivers/usb/gadget/udc/goku_udc.c index 46b8d14..d5a93ea 100644 --- a/drivers/usb/gadget/udc/goku_udc.c +++ b/drivers/usb/gadget/udc/goku_udc.c @@ -990,6 +990,30 @@ static int goku_get_frame(struct usb_gadget *_gadget) return -EOPNOTSUPP; } +static struct usb_ep *goku_match_ep(struct usb_gadget *g, + struct usb_endpoint_descriptor *desc, + struct usb_ss_ep_comp_descriptor *ep_comp) +{ + struct goku_udc *dev = to_goku_udc(g); + struct usb_ep *ep; + u8 type = usb_endpoint_type(desc); + + if (type == USB_ENDPOINT_XFER_INT) { + /* single buffering is enough */ + ep = &dev->ep[3].ep; + if (ep && usb_gadget_ep_match_desc(g, ep, desc, ep_comp)) + return ep; + } else if (type == USB_ENDPOINT_XFER_BULK + && usb_endpoint_dir_in(desc)) { + /* DMA may be available */ + ep = &dev->ep[2].ep; + if (ep && usb_gadget_ep_match_desc(g, ep, desc, ep_comp)) + return ep; + } + + return NULL; +} + static int goku_udc_start(struct usb_gadget *g, struct usb_gadget_driver *driver); static int goku_udc_stop(struct usb_gadget *g); @@ -998,6 +1022,7 @@ static const struct usb_gadget_ops goku_ops = { .get_frame = goku_get_frame, .udc_start = goku_udc_start, .udc_stop = goku_udc_stop, + .match_ep = goku_match_ep, // no remote wakeup // not selfpowered }; -- 1.9.1