From: Robert Baldyga <r.baldyga@samsung.com>
To: gregkh@linuxfoundation.org, balbi@ti.com
Cc: 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, Robert Baldyga <r.baldyga@samsung.com>
Subject: [PATCH v3 43/46] usb: gadget: move find_ep() from epautoconf to gadget.h
Date: Wed, 15 Jul 2015 08:32:30 +0200 [thread overview]
Message-ID: <1436941953-1327-44-git-send-email-r.baldyga@samsung.com> (raw)
In-Reply-To: <1436941953-1327-1-git-send-email-r.baldyga@samsung.com>
Move find_ep() function to gadget.h, rename it to gadget_find_ep_by_name()
and make it static inline. It can be used in UDC drivers, especially in
'match_ep' callback after moving chip-specific endpoint matching logic from
epautoconf to UDC drivers.
Replace all calls of find_ep() function with gadget_find_ep_by_name().
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
drivers/usb/gadget/epautoconf.c | 30 +++++++++---------------------
include/linux/usb/gadget.h | 18 ++++++++++++++++++
2 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index 3f0a380..cc0b084 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -22,18 +22,6 @@
#include "gadget_chips.h"
-static struct usb_ep *
-find_ep (struct usb_gadget *gadget, const char *name)
-{
- struct usb_ep *ep;
-
- list_for_each_entry (ep, &gadget->ep_list, ep_list) {
- if (0 == strcmp (ep->name, name))
- return ep;
- }
- return NULL;
-}
-
/**
* usb_ep_autoconfig_ss() - choose an endpoint matching the ep
* descriptor and ep companion descriptor
@@ -103,11 +91,11 @@ struct usb_ep *usb_ep_autoconfig_ss(
if (type == USB_ENDPOINT_XFER_INT) {
/* ep-e, ep-f are PIO with only 64 byte fifos */
- ep = find_ep(gadget, "ep-e");
+ 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 = find_ep(gadget, "ep-f");
+ ep = gadget_find_ep_by_name(gadget, "ep-f");
if (ep && usb_gadget_ep_match_desc(gadget,
ep, desc, ep_comp))
goto found_ep;
@@ -116,20 +104,20 @@ struct usb_ep *usb_ep_autoconfig_ss(
/* 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 = find_ep(gadget, name);
+ 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 (USB_ENDPOINT_XFER_INT == type) {
/* single buffering is enough */
- ep = find_ep(gadget, "ep3-bulk");
+ 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 = find_ep(gadget, "ep2-bulk");
+ ep = gadget_find_ep_by_name(gadget, "ep2-bulk");
if (ep && usb_gadget_ep_match_desc(gadget,
ep, desc, ep_comp))
goto found_ep;
@@ -140,14 +128,14 @@ struct usb_ep *usb_ep_autoconfig_ss(
if ((USB_ENDPOINT_XFER_BULK == type) ||
(USB_ENDPOINT_XFER_ISOC == type)) {
if (USB_DIR_IN & desc->bEndpointAddress)
- ep = find_ep (gadget, "ep5in");
+ ep = gadget_find_ep_by_name(gadget, "ep5in");
else
- ep = find_ep (gadget, "ep6out");
+ ep = gadget_find_ep_by_name(gadget, "ep6out");
} else if (USB_ENDPOINT_XFER_INT == type) {
if (USB_DIR_IN & desc->bEndpointAddress)
- ep = find_ep(gadget, "ep1in");
+ ep = gadget_find_ep_by_name(gadget, "ep1in");
else
- ep = find_ep(gadget, "ep2out");
+ ep = gadget_find_ep_by_name(gadget, "ep2out");
} else
ep = NULL;
if (ep && usb_gadget_ep_match_desc(gadget, ep, desc, ep_comp))
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 77e2c1e..42e951b 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -629,6 +629,24 @@ static inline struct usb_gadget *dev_to_usb_gadget(struct device *dev)
#define gadget_for_each_ep(tmp, gadget) \
list_for_each_entry(tmp, &(gadget)->ep_list, ep_list)
+/**
+ * gadget_find_ep_by_name - returns ep whose name is the same as sting passed
+ * in second parameter or NULL if searched endpoint not found
+ * @g: controller to check for quirk
+ * @name: name of searched endpoint
+ */
+static inline struct usb_ep *
+gadget_find_ep_by_name(struct usb_gadget *g, const char *name)
+{
+ struct usb_ep *ep;
+
+ gadget_for_each_ep(ep, g) {
+ if (!strcmp(ep->name, name))
+ return ep;
+ }
+
+ return NULL;
+}
/**
* usb_ep_align_maybe - returns @len aligned to ep's maxpacketsize if gadget
--
1.9.1
next prev parent reply other threads:[~2015-07-15 6:38 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-15 6:31 [PATCH v3 00/46] usb: gadget: rework ep matching and claiming mechanism Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 01/46] usb: gadget: encapsulate endpoint " Robert Baldyga
2015-07-20 14:43 ` Krzysztof Opasiak
2015-07-15 6:31 ` [PATCH v3 02/46] usb: gadget: add endpoint capabilities flags Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 03/46] usb: gadget: add endpoint capabilities helper macros Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 04/46] staging: emxx_udc: add ep capabilities support Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 05/46] usb: chipidea: udc: " Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 06/46] usb: dwc2: gadget: " Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 07/46] usb: dwc3: " Robert Baldyga
2015-07-21 16:43 ` Felipe Balbi
2015-07-15 6:31 ` [PATCH v3 08/46] usb: gadget: amd5536udc: " Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 09/46] usb: gadget: at91_udc: " Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 10/46] usb: gadget: bcm63xx_udc: " Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 11/46] usb: gadget: bdc: " Robert Baldyga
2015-07-15 6:31 ` [PATCH v3 12/46] usb: gadget: dummy-hcd: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 13/46] usb: gadget: fotg210-udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 14/46] usb: gadget: fsl_qe_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 15/46] usb: gadget: fsl_udc_core: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 16/46] usb: gadget: fusb300_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 17/46] usb: gadget: goku_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 18/46] usb: gadget: gr_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 19/46] usb: gadget: lpc32xx_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 20/46] usb: gadget: m66592-udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 21/46] usb: gadget: mv_u3d_core: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 22/46] usb: gadget: mv_udc_core: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 23/46] usb: gadget: net2272: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 24/46] usb: gadget: net2280: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 25/46] usb: gadget: omap_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 26/46] usb: gadget: pch_ud: " Robert Baldyga
2015-07-20 15:08 ` Krzysztof Opasiak
2015-07-25 9:34 ` Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 27/46] usb: gadget: pxa25x_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 28/46] usb: gadget: pxa27x_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 29/46] usb: gadget: r8a66597-udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 30/46] usb: gadget: s3c-hsudc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 31/46] usb: gadget: s3c2410_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 32/46] usb: gadget: udc-xilinx: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 33/46] usb: isp1760: udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 34/46] usb: musb: gadget: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 35/46] usb: renesas: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 36/46] usb: gadget: atmel_usba_udc: " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 37/46] usb: gadget: epautoconf: add endpoint capabilities flags verification Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 38/46] usb: gadget: epautoconf: remove pxa quirk from ep_matches() Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 39/46] usb: gadget: epautoconf: remove ep and desc configuration " Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 40/46] usb: gadget: epautoconf: rework ep_matches() function Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 41/46] usb: gadget: add 'ep_match' callback to usb_gadget_ops Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 42/46] usb: gadget: move ep_matches() from epautoconf to udc-core Robert Baldyga
2015-07-15 6:32 ` Robert Baldyga [this message]
2015-07-15 6:32 ` [PATCH v3 44/46] usb: gadget: net2280: add net2280_match_ep() function Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 45/46] usb: gadget: goku_udc: add goku_match_ep() function Robert Baldyga
2015-07-15 6:32 ` [PATCH v3 46/46] usb: musb: gadget: add musb_match_ep() function Robert Baldyga
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436941953-1327-44-git-send-email-r.baldyga@samsung.com \
--to=r.baldyga@samsung.com \
--cc=Peter.Chen@freescale.com \
--cc=andrzej.p@samsung.com \
--cc=balbi@ti.com \
--cc=cernekee@gmail.com \
--cc=dahlmann.thomas@arcor.de \
--cc=daniel@zonque.org \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=haojian.zhuang@gmail.com \
--cc=johnyoun@synopsys.com \
--cc=leoli@freescale.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-geode@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=m.szyprowski@samsung.com \
--cc=michal.simek@xilinx.com \
--cc=nicolas.ferre@atmel.com \
--cc=robert.jarzmik@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).