summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid Cohen <david.a.cohen@linux.intel.com>2013-12-10 00:55:34 +0100
committerMarek Szyprowski <m.szyprowski@samsung.com>2014-05-15 07:26:39 +0200
commit6654cf51bde0c12a49b0da0607ccea3299619084 (patch)
treece454407938ca56a9613fdf4888731f1a441fb5b /include
parent5df0b1c92d2bc38d4c47197a01c9eb25e3267c56 (diff)
downloadlinux-3.10-6654cf51bde0c12a49b0da0607ccea3299619084.tar.gz
linux-3.10-6654cf51bde0c12a49b0da0607ccea3299619084.tar.bz2
linux-3.10-6654cf51bde0c12a49b0da0607ccea3299619084.zip
usb: gadget: move bitflags to the end of usb_gadget struct
This patch moves all bitflags to the end of usb_gadget struct in order to improve readability. Signed-off-by: David Cohen <david.a.cohen@linux.intel.com> Acked-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Felipe Balbi <balbi@ti.com> [backport from mainline] Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/usb/gadget.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 16892ab59c8..6241ace2d50 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -483,6 +483,11 @@ struct usb_gadget_ops {
* @max_speed: Maximal speed the UDC can handle. UDC must support this
* and all slower speeds.
* @state: the state we are now (attached, suspended, configured, etc)
+ * @name: Identifies the controller hardware type. Used in diagnostics
+ * and sometimes configuration.
+ * @dev: Driver model state for this abstract device.
+ * @out_epnum: last used out ep number
+ * @in_epnum: last used in ep number
* @sg_supported: true if we can handle scatter-gather
* @is_otg: True if the USB device port uses a Mini-AB jack, so that the
* gadget driver must provide a USB OTG descriptor.
@@ -495,11 +500,6 @@ struct usb_gadget_ops {
* only supports HNP on a different root port.
* @b_hnp_enable: OTG device feature flag, indicating that the A-Host
* enabled HNP support.
- * @name: Identifies the controller hardware type. Used in diagnostics
- * and sometimes configuration.
- * @dev: Driver model state for this abstract device.
- * @out_epnum: last used out ep number
- * @in_epnum: last used in ep number
*
* Gadgets have a mostly-portable "gadget driver" implementing device
* functions, handling all usb configurations and interfaces. Gadget
@@ -527,6 +527,11 @@ struct usb_gadget {
enum usb_device_speed speed;
enum usb_device_speed max_speed;
enum usb_device_state state;
+ const char *name;
+ struct device dev;
+ unsigned out_epnum;
+ unsigned in_epnum;
+
unsigned sg_supported:1;
unsigned is_otg:1;
unsigned is_a_peripheral:1;
@@ -534,10 +539,6 @@ struct usb_gadget {
unsigned a_hnp_support:1;
unsigned a_alt_hnp_support:1;
atomic_t connect_count;
- const char *name;
- struct device dev;
- unsigned out_epnum;
- unsigned in_epnum;
};
static inline void set_gadget_data(struct usb_gadget *gadget, void *data)