Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1225972

[PATCH v2 04/26] usb: gadget: introduce 'enabled' flag in struct usb_ep

Show all headers | View raw

This patch introduces 'enabled' flag in struct usb_ep, and modifies
usb_ep_enable() and usb_ep_disable() functions to encapsulate endpoint
enabled/disabled state. It helps to avoid enabling endpoints which are
already enabled, and disabling endpoints which are already disables.

From now USB functions don't have to remember current endpoint
enable/disable state, as this state is now handled automatically which
makes this API less bug-prone.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
 include/linux/usb/gadget.h | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 3f299e2..3d583a1 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -215,6 +215,7 @@ struct usb_ep {
 	struct list_head	ep_list;
 	struct usb_ep_caps	caps;
 	bool			claimed;
+	bool			enabled;
 	unsigned		maxpacket:16;
 	unsigned		maxpacket_limit:16;
 	unsigned		max_streams:16;
@@ -264,7 +265,18 @@ static inline void usb_ep_set_maxpacket_limit(struct usb_ep *ep,
  */
 static inline int usb_ep_enable(struct usb_ep *ep)
 {
-	return ep->ops->enable(ep, ep->desc);
+	int ret;
+
+	if (ep->enabled)
+		return 0;
+
+	ret = ep->ops->enable(ep, ep->desc);
+	if (ret)
+		return ret;
+
+	ep->enabled = true;
+
+	return 0;
 }
 
 /**
@@ -281,7 +293,18 @@ static inline int usb_ep_enable(struct usb_ep *ep)
  */
 static inline int usb_ep_disable(struct usb_ep *ep)
 {
-	return ep->ops->disable(ep);
+	int ret;
+
+	if (!ep->enabled)
+		return 0;
+
+	ret = ep->ops->disable(ep);
+	if (ret)
+		return ret;
+
+	ep->enabled = false;
+
+	return 0;
 }
 
 /**
-- 
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/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 00/26] usb: gadget: encapsulate ep enable/disable Robert Baldyga <r.baldyga@samsung.com> - 2015-09-16 12:20 +0200
  [PATCH v2 03/26] usb: gadget: epautoconf: add  usb_ep_autoconfig_release() function Robert Baldyga <r.baldyga@samsung.com> - 2015-09-16 12:20 +0200
  [PATCH v2 11/26] usb: gadget: f_midi: eliminate abuse of ep->driver  data Robert Baldyga <r.baldyga@samsung.com> - 2015-09-16 12:20 +0200
  [PATCH v2 10/26] usb: gadget: f_mass_storage: eliminate abuse of  ep->driver data Robert Baldyga <r.baldyga@samsung.com> - 2015-09-16 12:20 +0200
  [PATCH v2 08/26] usb: gadget: f_hid: eliminate abuse of ep->driver data Robert Baldyga <r.baldyga@samsung.com> - 2015-09-16 12:20 +0200
  [PATCH v2 20/26] usb: gadget: f_uac1: eliminate abuse of ep->driver  data Robert Baldyga <r.baldyga@samsung.com> - 2015-09-16 12:20 +0200
  [PATCH v2 23/26] usb: gadget: u_ether: eliminate abuse of ep->driver  data Robert Baldyga <r.baldyga@samsung.com> - 2015-09-16 12:20 +0200
  [PATCH v2 12/26] usb: gadget: f_ncm: eliminate abuse of ep->driver data Robert Baldyga <r.baldyga@samsung.com> - 2015-09-16 12:20 +0200
  [PATCH v2 16/26] usb: gadget: f_rndis: eliminate abuse of ep->driver  data Robert Baldyga <r.baldyga@samsung.com> - 2015-09-16 12:20 +0200
  [PATCH v2 18/26] usb: gadget: f_sourcesink: eliminate abuse of  ep->driver data Robert Baldyga <r.baldyga@samsung.com> - 2015-09-16 12:20 +0200
  [PATCH v2 26/26] usb: gadget: legacy: tcm: eliminate abuse of  ep->driver data Robert Baldyga <r.baldyga@samsung.com> - 2015-09-16 12:20 +0200
  [PATCH v2 09/26] usb: gadget: f_loopback: eliminate abuse of  ep->driver data Robert Baldyga <r.baldyga@samsung.com> - 2015-09-16 12:30 +0200
  [PATCH v2 04/26] usb: gadget: introduce 'enabled' flag in struct usb_ep Robert Baldyga <r.baldyga@samsung.com> - 2015-09-16 12:30 +0200
  [PATCH v2 02/26] usb: gadget: f_ncm: obtain cdev from function instead  of driver_data Robert Baldyga <r.baldyga@samsung.com> - 2015-09-16 12:30 +0200
  [PATCH v2 01/26] usb: gadget: fix few outdated comments Robert Baldyga <r.baldyga@samsung.com> - 2015-09-16 12:30 +0200

csiph-web