diff options
author | Michal Nazarewicz <mina86@mina86.com> | 2011-11-19 12:27:37 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2011-12-12 04:45:11 -0500 |
commit | d327ab5b6d660d6fe22b073b743fde1668e593bb (patch) | |
tree | f32166a8a1bf562f6e235a2ce1b6ec0a6fead6ae /include/linux/usb | |
parent | 7aac8d1537b1fd1a9e39bd16edcd6728c19f8dd5 (diff) |
usb: gadget: replace usb_gadget::is_dualspeed with max_speed
This commit replaces usb_gadget's is_dualspeed field with
a max_speed field.
[ balbi@ti.com : Fixed DWC3 driver ]
Signed-off-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.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index 1d3a67523ffc..98dc306898b5 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h | |||
@@ -477,8 +477,8 @@ struct usb_gadget_ops { | |||
477 | * driver setup() requests | 477 | * driver setup() requests |
478 | * @ep_list: List of other endpoints supported by the device. | 478 | * @ep_list: List of other endpoints supported by the device. |
479 | * @speed: Speed of current connection to USB host. | 479 | * @speed: Speed of current connection to USB host. |
480 | * @is_dualspeed: True if the controller supports both high and full speed | 480 | * @max_speed: Maximal speed the UDC can handle. UDC must support this |
481 | * operation. If it does, the gadget driver must also support both. | 481 | * and all slower speeds. |
482 | * @is_otg: True if the USB device port uses a Mini-AB jack, so that the | 482 | * @is_otg: True if the USB device port uses a Mini-AB jack, so that the |
483 | * gadget driver must provide a USB OTG descriptor. | 483 | * gadget driver must provide a USB OTG descriptor. |
484 | * @is_a_peripheral: False unless is_otg, the "A" end of a USB cable | 484 | * @is_a_peripheral: False unless is_otg, the "A" end of a USB cable |
@@ -518,7 +518,7 @@ struct usb_gadget { | |||
518 | struct usb_ep *ep0; | 518 | struct usb_ep *ep0; |
519 | struct list_head ep_list; /* of usb_ep */ | 519 | struct list_head ep_list; /* of usb_ep */ |
520 | enum usb_device_speed speed; | 520 | enum usb_device_speed speed; |
521 | unsigned is_dualspeed:1; | 521 | enum usb_device_speed max_speed; |
522 | unsigned is_otg:1; | 522 | unsigned is_otg:1; |
523 | unsigned is_a_peripheral:1; | 523 | unsigned is_a_peripheral:1; |
524 | unsigned b_hnp_enable:1; | 524 | unsigned b_hnp_enable:1; |
@@ -549,7 +549,7 @@ static inline struct usb_gadget *dev_to_usb_gadget(struct device *dev) | |||
549 | static inline int gadget_is_dualspeed(struct usb_gadget *g) | 549 | static inline int gadget_is_dualspeed(struct usb_gadget *g) |
550 | { | 550 | { |
551 | #ifdef CONFIG_USB_GADGET_DUALSPEED | 551 | #ifdef CONFIG_USB_GADGET_DUALSPEED |
552 | /* runtime test would check "g->is_dualspeed" ... that might be | 552 | /* runtime test would check "g->max_speed" ... that might be |
553 | * useful to work around hardware bugs, but is mostly pointless | 553 | * useful to work around hardware bugs, but is mostly pointless |
554 | */ | 554 | */ |
555 | return 1; | 555 | return 1; |
@@ -567,7 +567,7 @@ static inline int gadget_is_superspeed(struct usb_gadget *g) | |||
567 | { | 567 | { |
568 | #ifdef CONFIG_USB_GADGET_SUPERSPEED | 568 | #ifdef CONFIG_USB_GADGET_SUPERSPEED |
569 | /* | 569 | /* |
570 | * runtime test would check "g->is_superspeed" ... that might be | 570 | * runtime test would check "g->max_speed" ... that might be |
571 | * useful to work around hardware bugs, but is mostly pointless | 571 | * useful to work around hardware bugs, but is mostly pointless |
572 | */ | 572 | */ |
573 | return 1; | 573 | return 1; |