aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/usb
diff options
context:
space:
mode:
authorDavid Cohen <david.a.cohen@linux.intel.com>2013-12-09 18:55:34 -0500
committerFelipe Balbi <balbi@ti.com>2013-12-09 23:44:03 -0500
commitd8318d7f6bd08eba36ed2a7a23ac5389115958bc (patch)
tree2b60f1b27bf22ee3abcd66128a142d8c4a2b5fac /include/linux/usb
parentc3e5d2985ef720cbbdc63546a5c545ac4450d96e (diff)
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>
Diffstat (limited to 'include/linux/usb')
-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 942ef5e053bf..23b3bfd0a842 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -485,6 +485,11 @@ struct usb_gadget_ops {
485 * @max_speed: Maximal speed the UDC can handle. UDC must support this 485 * @max_speed: Maximal speed the UDC can handle. UDC must support this
486 * and all slower speeds. 486 * and all slower speeds.
487 * @state: the state we are now (attached, suspended, configured, etc) 487 * @state: the state we are now (attached, suspended, configured, etc)
488 * @name: Identifies the controller hardware type. Used in diagnostics
489 * and sometimes configuration.
490 * @dev: Driver model state for this abstract device.
491 * @out_epnum: last used out ep number
492 * @in_epnum: last used in ep number
488 * @sg_supported: true if we can handle scatter-gather 493 * @sg_supported: true if we can handle scatter-gather
489 * @is_otg: True if the USB device port uses a Mini-AB jack, so that the 494 * @is_otg: True if the USB device port uses a Mini-AB jack, so that the
490 * gadget driver must provide a USB OTG descriptor. 495 * gadget driver must provide a USB OTG descriptor.
@@ -497,11 +502,6 @@ struct usb_gadget_ops {
497 * only supports HNP on a different root port. 502 * only supports HNP on a different root port.
498 * @b_hnp_enable: OTG device feature flag, indicating that the A-Host 503 * @b_hnp_enable: OTG device feature flag, indicating that the A-Host
499 * enabled HNP support. 504 * enabled HNP support.
500 * @name: Identifies the controller hardware type. Used in diagnostics
501 * and sometimes configuration.
502 * @dev: Driver model state for this abstract device.
503 * @out_epnum: last used out ep number
504 * @in_epnum: last used in ep number
505 * 505 *
506 * Gadgets have a mostly-portable "gadget driver" implementing device 506 * Gadgets have a mostly-portable "gadget driver" implementing device
507 * functions, handling all usb configurations and interfaces. Gadget 507 * functions, handling all usb configurations and interfaces. Gadget
@@ -530,16 +530,17 @@ struct usb_gadget {
530 enum usb_device_speed speed; 530 enum usb_device_speed speed;
531 enum usb_device_speed max_speed; 531 enum usb_device_speed max_speed;
532 enum usb_device_state state; 532 enum usb_device_state state;
533 const char *name;
534 struct device dev;
535 unsigned out_epnum;
536 unsigned in_epnum;
537
533 unsigned sg_supported:1; 538 unsigned sg_supported:1;
534 unsigned is_otg:1; 539 unsigned is_otg:1;
535 unsigned is_a_peripheral:1; 540 unsigned is_a_peripheral:1;
536 unsigned b_hnp_enable:1; 541 unsigned b_hnp_enable:1;
537 unsigned a_hnp_support:1; 542 unsigned a_hnp_support:1;
538 unsigned a_alt_hnp_support:1; 543 unsigned a_alt_hnp_support:1;
539 const char *name;
540 struct device dev;
541 unsigned out_epnum;
542 unsigned in_epnum;
543}; 544};
544#define work_to_gadget(w) (container_of((w), struct usb_gadget, work)) 545#define work_to_gadget(w) (container_of((w), struct usb_gadget, work))
545 546