From patchwork Mon Jul 27 09:16:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Baldyga X-Patchwork-Id: 6871201 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 731A1C05AC for ; Mon, 27 Jul 2015 09:33:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 89AF720650 for ; Mon, 27 Jul 2015 09:33:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3F46220685 for ; Mon, 27 Jul 2015 09:33:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753375AbbG0JR4 (ORCPT ); Mon, 27 Jul 2015 05:17:56 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:56342 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752562AbbG0JRr (ORCPT ); Mon, 27 Jul 2015 05:17:47 -0400 Received: from epcpsbgm1new.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NS502QKM35LYR90@mailout2.samsung.com>; Mon, 27 Jul 2015 18:17:46 +0900 (KST) X-AuditID: cbfee61a-f79a06d000005c6f-07-55b5f73940e3 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id AD.98.23663.937F5B55; Mon, 27 Jul 2015 18:17:46 +0900 (KST) Received: from AMDC2122.DIGITAL.local ([106.120.53.17]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NS500L1Z34BGGA0@mmp1.samsung.com>; Mon, 27 Jul 2015 18:17:45 +0900 (KST) 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 04/46] staging: emxx_udc: add ep capabilities support Date: Mon, 27 Jul 2015 11:16:14 +0200 Message-id: <1437988616-6962-5-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+t9jAV2r71tDDT63s1vMetnOYnHwfr3F 3gV3GS067x9mtmj6+4rFYs+ZX+wWzYvXs1lcWGdusfv0JUaLXw+ELDY9vsZq0X/uNIvF5V1z 2CxmL+lnsVi0rJXZ4vf3f6wWa4/cZbd49zLC4tvlZnaLY7P/MlnM75jKavHg8E6gTW+ELSb8 vsDmIOEx+clGJo8Fv7ayeNzbd5jFo3/dZ1aPf4f7mTx2zrrL7rF/7hp2j81L6j3Oz1jI6DH7 7g9Gj74tqxg9tuz/zOhx/MZ2Jo+ZK3vZPD5vkvPY+/k3S4BgFJdNSmpOZllqkb5dAlfG4QW7 2ArWi1ZM36/fwPhBsIuRk0NCwETi06ZZ7BC2mMSFe+vZuhi5OIQEljJKTGk4xgzh/GSUmPB8 EhNIFZuAjsSW7xMYQWwRAQGJ9S8usYMUMQv8YJE4O68bbJSwgIfEj+WTmEFsFgFViYs3V4HF eQVcJCa8msgEsU5O4uSxyawgNqeAq8SSaVuB4hxA21wkjlzXmsDIu4CRYRWjRGpBckFxUnqu YV5quV5xYm5xaV66XnJ+7iZGcJw9k9rBeHCX+yFGAQ5GJR7eCypbQ4VYE8uKK3MPMUpwMCuJ 8D6OAgrxpiRWVqUW5ccXleakFh9ilOZgURLnld2wOVRIID2xJDU7NbUgtQgmy8TBKdXAWHyg cyOLmmSMLddD1grlhVN95foLM4tnliV99rtU93jXzPbYeS5sS+W11u9kfuO61onT8/+E3mYP a5H74jkqlz20vI50dfb1lPXEhZ9cXzyD7dDSZrmidcUq6WdCHywxS7Cv38d3tE2SLbXwozq/ eK7SmY2fVq5gPsrrY8vSbb2e88atfi4lluKMREMt5qLiRAATyQ8orwIAAA== Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Convert endpoint configuration to new capabilities model. Fixed typo in "epc-nulk" to "epc-bulk". Signed-off-by: Robert Baldyga --- drivers/staging/emxx_udc/emxx_udc.c | 60 ++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c index 3b7aa36..0d64bee 100644 --- a/drivers/staging/emxx_udc/emxx_udc.c +++ b/drivers/staging/emxx_udc/emxx_udc.c @@ -3153,36 +3153,33 @@ static const struct usb_gadget_ops nbu2ss_gadget_ops = { .ioctl = nbu2ss_gad_ioctl, }; -static const char g_ep0_name[] = "ep0"; -static const char g_ep1_name[] = "ep1-bulk"; -static const char g_ep2_name[] = "ep2-bulk"; -static const char g_ep3_name[] = "ep3in-int"; -static const char g_ep4_name[] = "ep4-iso"; -static const char g_ep5_name[] = "ep5-iso"; -static const char g_ep6_name[] = "ep6-bulk"; -static const char g_ep7_name[] = "ep7-bulk"; -static const char g_ep8_name[] = "ep8in-int"; -static const char g_ep9_name[] = "ep9-iso"; -static const char g_epa_name[] = "epa-iso"; -static const char g_epb_name[] = "epb-bulk"; -static const char g_epc_name[] = "epc-nulk"; -static const char g_epd_name[] = "epdin-int"; - -static const char *gp_ep_name[NUM_ENDPOINTS] = { - g_ep0_name, - g_ep1_name, - g_ep2_name, - g_ep3_name, - g_ep4_name, - g_ep5_name, - g_ep6_name, - g_ep7_name, - g_ep8_name, - g_ep9_name, - g_epa_name, - g_epb_name, - g_epc_name, - g_epd_name, +static const struct { + const char *name; + const struct usb_ep_caps caps; +} ep_info[NUM_ENDPOINTS] = { +#define EP_INFO(_name, _type, _dir) \ + { \ + .name = _name, \ + .caps = USB_EP_CAPS(USB_EP_CAPS_TYPE_ ## _type, \ + USB_EP_CAPS_DIR_ ## _dir), \ + } + + EP_INFO("ep0", CONTROL, ALL), + EP_INFO("ep1-bulk", BULK, ALL), + EP_INFO("ep2-bulk", BULK, ALL), + EP_INFO("ep3in-int", INT, IN), + EP_INFO("ep4-iso", INT, ALL), + EP_INFO("ep5-iso", ISO, ALL), + EP_INFO("ep6-bulk", ISO, ALL), + EP_INFO("ep7-bulk", BULK, ALL), + EP_INFO("ep8in-int", INT, IN), + EP_INFO("ep9-iso", ISO, ALL), + EP_INFO("epa-iso", ISO, ALL), + EP_INFO("epb-bulk", BULK, ALL), + EP_INFO("epc-bulk", BULK, ALL), + EP_INFO("epdin-int", INT, IN), + +#undef EP_INFO }; /*-------------------------------------------------------------------------*/ @@ -3200,7 +3197,8 @@ static void __init nbu2ss_drv_ep_init(struct nbu2ss_udc *udc) ep->desc = NULL; ep->ep.driver_data = NULL; - ep->ep.name = gp_ep_name[i]; + ep->ep.name = ep_info[i].name; + ep->ep.caps = ep_info[i].caps; ep->ep.ops = &nbu2ss_ep_ops; usb_ep_set_maxpacket_limit(&ep->ep,