According to USB 3.1 Specification, that field is
called bU1DevExitLat with a capitalized 'Dev'.
Just to make grepping in the spec easier, let's
match the name.
Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxxxxxxxx>
---
drivers/usb/core/hub.c | 8 ++++----
drivers/usb/gadget/composite.c | 4 ++--
include/linux/usb/gadget.h | 2 +-
include/uapi/linux/usb/ch9.h | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 0f87c62a81db..b706f3d0a5b9 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -151,7 +151,7 @@ int usb_device_supports_lpm(struct usb_device *udev)
return 0;
}
- if (udev->bos->ss_cap->bU1devExitLat == 0 &&
+ if (udev->bos->ss_cap->bU1DevExitLat == 0 &&
udev->bos->ss_cap->wU2DevExitLat == 0) {
if (udev->parent)
dev_info(&udev->dev, "LPM exit latency is zeroed, disabling LPM.\n");
@@ -310,9 +310,9 @@ static void usb_set_lpm_parameters(struct usb_device *udev)
if (!hub)
return;
- udev_u1_del = udev->bos->ss_cap->bU1devExitLat;
+ udev_u1_del = udev->bos->ss_cap->bU1DevExitLat;
udev_u2_del = le16_to_cpu(udev->bos->ss_cap->wU2DevExitLat);
- hub_u1_del = udev->parent->bos->ss_cap->bU1devExitLat;
+ hub_u1_del = udev->parent->bos->ss_cap->bU1DevExitLat;
hub_u2_del = le16_to_cpu(udev->parent->bos->ss_cap->wU2DevExitLat);
usb_set_lpm_mel(udev, &udev->u1_params, udev_u1_del,
@@ -3908,7 +3908,7 @@ static void usb_enable_link_state(struct usb_hcd *hcd, struct usb_device *udev,
enum usb3_link_state state)
{
int timeout, ret;
- __u8 u1_mel = udev->bos->ss_cap->bU1devExitLat;
+ __u8 u1_mel = udev->bos->ss_cap->bU1DevExitLat;
__le16 u2_mel = udev->bos->ss_cap->wU2DevExitLat;
/* If the device says it doesn't have *any* exit latency to come out of
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 7c914dabfed4..f4d92d35f3a4 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -645,11 +645,11 @@ static int bos_desc(struct usb_composite_dev *cdev)
if (cdev->gadget->ops->get_config_params)
cdev->gadget->ops->get_config_params(&dcd_config_params);
else {
- dcd_config_params.bU1devExitLat = USB_DEFAULT_U1_DEV_EXIT_LAT;
+ dcd_config_params.bU1DevExitLat = USB_DEFAULT_U1_DEV_EXIT_LAT;
dcd_config_params.wU2DevExitLat =
cpu_to_le16(USB_DEFAULT_U2_DEV_EXIT_LAT);
}
- ss_cap->bU1devExitLat = dcd_config_params.bU1devExitLat;
+ ss_cap->bU1DevExitLat = dcd_config_params.bU1DevExitLat;
ss_cap->wU2DevExitLat = dcd_config_params.wU2DevExitLat;
/* The SuperSpeedPlus USB Device Capability descriptor */
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index ad29bfa23bd9..3667d667cab1 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -277,7 +277,7 @@ static inline void usb_ep_fifo_flush(struct usb_ep *ep)
/*-------------------------------------------------------------------------*/
struct usb_dcd_config_params {
- __u8 bU1devExitLat; /* U1 Device exit Latency */
+ __u8 bU1DevExitLat; /* U1 Device exit Latency */
#define USB_DEFAULT_U1_DEV_EXIT_LAT 0x01 /* Less then 1 microsec */
__le16 wU2DevExitLat; /* U2 Device exit Latency */
#define USB_DEFAULT_U2_DEV_EXIT_LAT 0x1F4 /* Less then 500 microsec */
diff --git a/include/uapi/linux/usb/ch9.h b/include/uapi/linux/usb/ch9.h
index 35b2a3109e2b..a72512b1f8f3 100644
--- a/include/uapi/linux/usb/ch9.h
+++ b/include/uapi/linux/usb/ch9.h
@@ -888,7 +888,7 @@ struct usb_ss_cap_descriptor { /* Link Power Management */
#define USB_HIGH_SPEED_OPERATION (1 << 2) /* High speed operation */
#define USB_5GBPS_OPERATION (1 << 3) /* Operation at 5Gbps */
__u8 bFunctionalitySupport;
- __u8 bU1devExitLat;
+ __u8 bU1DevExitLat;
__le16 wU2DevExitLat;
} __attribute__((packed));
--
2.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
