From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754768AbbG0Jcq (ORCPT ); Mon, 27 Jul 2015 05:32:46 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:46111 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752134AbbG0JSZ (ORCPT ); Mon, 27 Jul 2015 05:18:25 -0400 X-AuditID: cbfee61b-f79706d000001b96-4c-55b5f75fd4ab 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 09/46] usb: gadget: at91_udc: add ep capabilities support Date: Mon, 27 Jul 2015 11:16:19 +0200 Message-id: <1437988616-6962-10-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: H4sIAAAAAAAAAzWRXUhTYRzGfXfe7ZwNF8cpddBaMAxMSpcZvVBIRtoJvBDCCots6VGH2xyb n924lLFSagNNcstcakKSruaWn8vc/GSmS8nsYmrYl2FBDpwfOHJFd7//73ngufgTmMAEIwmp oohRKSQyEYcH3YFl8miW354h1jaEI+OKDqKhxQrkMHsBurvowlDlzg+IBia3cFTVYuEgT+dJ 1O+eAWhrSYCsy3NspJ9yQzTb94iDTK16iJrbtBja9gfYqGPYi6NfK1fQ+mwVjkZNOyzUdOcB Gy25enFkXA1Hhm0P5wxF135+yaLNW3ZIL7x2QVrf6WPTAZeeRfcavTg92Pgcp7taK+jph08A bfJuAPq+rR3QtkEfoMfmu1l0w7N7HNpnFdIO3zZMD8vknc5hZNISRhWfdIOXP/BGhyldoWVz t+ugBhh41YAgKDKRGhk5Xg24u7iX8ixYONWARwjIp4Aa0gXAv2MTUL/Hp2GwxSGPUDa/AQQ5 giQpy/cZPFjCyA1IvX1cgweDcDKNWtP0geACJA9Rk2Nng5pPplAOSxf+b01ITYzWsoPM3fWt 9XZWsC4gz1HDH2INgG8GIe2AYpTZSvXNPHmCgimNU0vk6mJFXlx2odwK/r7sa1QPcPWddwKS AKJQvifaniFgS0rU5XInoAhMFMFfztxV/BxJ+S1GVZilKpYxaieIIqBoHz8+0ZohIPMkRUwB wygZ1f+URXAjNaBmtbJywgm5jVXCn++amqNnysYnL9lOzedeLz0Rkyy9sIDpiKm29129POH0 4Zh6935t45oq4VPCZq5e7Fz5+CJVWJyk6G5uOfBqj/Faz5dZgbRDczFH3g+58QevytOWFGUh Kel+GZm5Lv52ecqRGlYgrtMmy8yO0Yh5u9kyIYLqfMmxWEyllvwB32BNba4CAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert endpoint configuration to new capabilities model. Signed-off-by: Robert Baldyga --- drivers/usb/gadget/udc/at91_udc.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/drivers/usb/gadget/udc/at91_udc.c b/drivers/usb/gadget/udc/at91_udc.c index fc42264..a04b073 100644 --- a/drivers/usb/gadget/udc/at91_udc.c +++ b/drivers/usb/gadget/udc/at91_udc.c @@ -59,15 +59,29 @@ #define DRIVER_VERSION "3 May 2006" static const char driver_name [] = "at91_udc"; -static const char * const ep_names[] = { - "ep0", - "ep1", - "ep2", - "ep3-int", - "ep4", - "ep5", + +static const struct { + const char *name; + const struct usb_ep_caps caps; +} ep_info[] = { +#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", ALL, ALL), + EP_INFO("ep2", ALL, ALL), + EP_INFO("ep3-int", INT, ALL), + EP_INFO("ep4", ALL, ALL), + EP_INFO("ep5", ALL, ALL), + +#undef EP_INFO }; -#define ep0name ep_names[0] + +#define ep0name ep_info[0].name #define VBUS_POLL_TIMEOUT msecs_to_jiffies(1000) @@ -1830,7 +1844,8 @@ static int at91udc_probe(struct platform_device *pdev) for (i = 0; i < NUM_ENDPOINTS; i++) { ep = &udc->ep[i]; - ep->ep.name = ep_names[i]; + ep->ep.name = ep_info[i].name; + ep->ep.caps = ep_info[i].caps; ep->ep.ops = &at91_ep_ops; ep->udc = udc; ep->int_mask = BIT(i); -- 1.9.1