Commit 0aecfc1b authored by Igor Kotrasinski's avatar Igor Kotrasinski Committed by Felipe Balbi

usb: gadget: composite: remove redundant bcdUSB setting in legacy

Since composite now overwrites bcdUSB for any gadget, remove
setting it in legacy gadgets. All legacy gadgets set 0x0200, the
same as the value additionally set by composite, so there is no
behaviour change.
Signed-off-by: default avatarIgor Kotrasinski <i.kotrasinsk@samsung.com>

Rebase onto current balbi/next
Signed-off-by: default avatarKrzysztof Opasiak <k.opasiak@samsung.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 69b76cdf
...@@ -40,7 +40,7 @@ static struct usb_device_descriptor device_desc = { ...@@ -40,7 +40,7 @@ static struct usb_device_descriptor device_desc = {
.bLength = sizeof device_desc, .bLength = sizeof device_desc,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16(0x0200), /* .bcdUSB = DYNAMIC */
.bDeviceClass = USB_CLASS_MISC /* 0xEF */, .bDeviceClass = USB_CLASS_MISC /* 0xEF */,
.bDeviceSubClass = 2, .bDeviceSubClass = 2,
......
...@@ -123,7 +123,7 @@ static struct usb_device_descriptor device_desc = { ...@@ -123,7 +123,7 @@ static struct usb_device_descriptor device_desc = {
.bLength = sizeof device_desc, .bLength = sizeof device_desc,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16(0x200), /* .bcdUSB = DYNAMIC */
#ifdef CONFIG_GADGET_UAC1 #ifdef CONFIG_GADGET_UAC1
.bDeviceClass = USB_CLASS_PER_INTERFACE, .bDeviceClass = USB_CLASS_PER_INTERFACE,
......
...@@ -43,7 +43,7 @@ static struct usb_device_descriptor device_desc = { ...@@ -43,7 +43,7 @@ static struct usb_device_descriptor device_desc = {
.bLength = sizeof device_desc, .bLength = sizeof device_desc,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16(0x0200), /* .bcdUSB = DYNAMIC */
.bDeviceClass = USB_CLASS_COMM, .bDeviceClass = USB_CLASS_COMM,
.bDeviceSubClass = 0, .bDeviceSubClass = 0,
......
...@@ -151,7 +151,7 @@ static struct usb_device_descriptor device_desc = { ...@@ -151,7 +151,7 @@ static struct usb_device_descriptor device_desc = {
.bLength = sizeof device_desc, .bLength = sizeof device_desc,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16 (0x0200), /* .bcdUSB = DYNAMIC */
.bDeviceClass = USB_CLASS_COMM, .bDeviceClass = USB_CLASS_COMM,
.bDeviceSubClass = 0, .bDeviceSubClass = 0,
......
...@@ -69,7 +69,7 @@ static struct usb_device_descriptor gfs_dev_desc = { ...@@ -69,7 +69,7 @@ static struct usb_device_descriptor gfs_dev_desc = {
.bLength = sizeof gfs_dev_desc, .bLength = sizeof gfs_dev_desc,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16(0x0200), /* .bcdUSB = DYNAMIC */
.bDeviceClass = USB_CLASS_PER_INTERFACE, .bDeviceClass = USB_CLASS_PER_INTERFACE,
.idVendor = cpu_to_le16(GFS_VENDOR_ID), .idVendor = cpu_to_le16(GFS_VENDOR_ID),
......
...@@ -78,7 +78,7 @@ MODULE_PARM_DESC(out_ports, "Number of MIDI output ports"); ...@@ -78,7 +78,7 @@ MODULE_PARM_DESC(out_ports, "Number of MIDI output ports");
static struct usb_device_descriptor device_desc = { static struct usb_device_descriptor device_desc = {
.bLength = USB_DT_DEVICE_SIZE, .bLength = USB_DT_DEVICE_SIZE,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16(0x0200), /* .bcdUSB = DYNAMIC */
.bDeviceClass = USB_CLASS_PER_INTERFACE, .bDeviceClass = USB_CLASS_PER_INTERFACE,
.idVendor = cpu_to_le16(DRIVER_VENDOR_NUM), .idVendor = cpu_to_le16(DRIVER_VENDOR_NUM),
.idProduct = cpu_to_le16(DRIVER_PRODUCT_NUM), .idProduct = cpu_to_le16(DRIVER_PRODUCT_NUM),
......
...@@ -47,7 +47,7 @@ static struct usb_device_descriptor device_desc = { ...@@ -47,7 +47,7 @@ static struct usb_device_descriptor device_desc = {
.bLength = sizeof device_desc, .bLength = sizeof device_desc,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16(0x0200), /* .bcdUSB = DYNAMIC */
/* .bDeviceClass = USB_CLASS_COMM, */ /* .bDeviceClass = USB_CLASS_COMM, */
/* .bDeviceSubClass = 0, */ /* .bDeviceSubClass = 0, */
......
...@@ -55,7 +55,7 @@ static struct usb_device_descriptor msg_device_desc = { ...@@ -55,7 +55,7 @@ static struct usb_device_descriptor msg_device_desc = {
.bLength = sizeof msg_device_desc, .bLength = sizeof msg_device_desc,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16(0x0200), /* .bcdUSB = DYNAMIC */
.bDeviceClass = USB_CLASS_PER_INTERFACE, .bDeviceClass = USB_CLASS_PER_INTERFACE,
/* Vendor and product id can be overridden by module parameters. */ /* Vendor and product id can be overridden by module parameters. */
......
...@@ -67,7 +67,7 @@ static struct usb_device_descriptor device_desc = { ...@@ -67,7 +67,7 @@ static struct usb_device_descriptor device_desc = {
.bLength = sizeof device_desc, .bLength = sizeof device_desc,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16(0x0200), /* .bcdUSB = DYNAMIC */
.bDeviceClass = USB_CLASS_MISC /* 0xEF */, .bDeviceClass = USB_CLASS_MISC /* 0xEF */,
.bDeviceSubClass = 2, .bDeviceSubClass = 2,
......
...@@ -49,7 +49,7 @@ static struct usb_device_descriptor device_desc = { ...@@ -49,7 +49,7 @@ static struct usb_device_descriptor device_desc = {
.bLength = sizeof device_desc, .bLength = sizeof device_desc,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16 (0x0200), /* .bcdUSB = DYNAMIC */
.bDeviceClass = USB_CLASS_COMM, .bDeviceClass = USB_CLASS_COMM,
.bDeviceSubClass = 0, .bDeviceSubClass = 0,
......
...@@ -89,7 +89,7 @@ static struct usb_gadget_strings *dev_strings[] = { ...@@ -89,7 +89,7 @@ static struct usb_gadget_strings *dev_strings[] = {
static struct usb_device_descriptor device_desc = { static struct usb_device_descriptor device_desc = {
.bLength = USB_DT_DEVICE_SIZE, .bLength = USB_DT_DEVICE_SIZE,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16(0x0200), /* .bcdUSB = DYNAMIC */
.bDeviceClass = USB_CLASS_COMM, .bDeviceClass = USB_CLASS_COMM,
.idVendor = cpu_to_le16(NOKIA_VENDOR_ID), .idVendor = cpu_to_le16(NOKIA_VENDOR_ID),
.idProduct = cpu_to_le16(NOKIA_PRODUCT_ID), .idProduct = cpu_to_le16(NOKIA_PRODUCT_ID),
......
...@@ -71,7 +71,7 @@ static struct usb_function *f_printer; ...@@ -71,7 +71,7 @@ static struct usb_function *f_printer;
static struct usb_device_descriptor device_desc = { static struct usb_device_descriptor device_desc = {
.bLength = sizeof device_desc, .bLength = sizeof device_desc,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16(0x0200), /* .bcdUSB = DYNAMIC */
.bDeviceClass = USB_CLASS_PER_INTERFACE, .bDeviceClass = USB_CLASS_PER_INTERFACE,
.bDeviceSubClass = 0, .bDeviceSubClass = 0,
.bDeviceProtocol = 0, .bDeviceProtocol = 0,
......
...@@ -65,7 +65,7 @@ static struct usb_gadget_strings *dev_strings[] = { ...@@ -65,7 +65,7 @@ static struct usb_gadget_strings *dev_strings[] = {
static struct usb_device_descriptor device_desc = { static struct usb_device_descriptor device_desc = {
.bLength = USB_DT_DEVICE_SIZE, .bLength = USB_DT_DEVICE_SIZE,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16(0x0200), /* .bcdUSB = DYNAMIC */
/* .bDeviceClass = f(use_acm) */ /* .bDeviceClass = f(use_acm) */
.bDeviceSubClass = 0, .bDeviceSubClass = 0,
.bDeviceProtocol = 0, .bDeviceProtocol = 0,
......
...@@ -1974,7 +1974,7 @@ static struct usb_descriptor_header *uasp_ss_function_desc[] = { ...@@ -1974,7 +1974,7 @@ static struct usb_descriptor_header *uasp_ss_function_desc[] = {
static struct usb_device_descriptor usbg_device_desc = { static struct usb_device_descriptor usbg_device_desc = {
.bLength = sizeof(usbg_device_desc), .bLength = sizeof(usbg_device_desc),
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16(0x0200), /* .bcdUSB = DYNAMIC */
.bDeviceClass = USB_CLASS_PER_INTERFACE, .bDeviceClass = USB_CLASS_PER_INTERFACE,
.idVendor = cpu_to_le16(UAS_VENDOR_ID), .idVendor = cpu_to_le16(UAS_VENDOR_ID),
.idProduct = cpu_to_le16(UAS_PRODUCT_ID), .idProduct = cpu_to_le16(UAS_PRODUCT_ID),
......
...@@ -77,7 +77,7 @@ static struct usb_function *f_uvc; ...@@ -77,7 +77,7 @@ static struct usb_function *f_uvc;
static struct usb_device_descriptor webcam_device_descriptor = { static struct usb_device_descriptor webcam_device_descriptor = {
.bLength = USB_DT_DEVICE_SIZE, .bLength = USB_DT_DEVICE_SIZE,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16(0x0200), /* .bcdUSB = DYNAMIC */
.bDeviceClass = USB_CLASS_MISC, .bDeviceClass = USB_CLASS_MISC,
.bDeviceSubClass = 0x02, .bDeviceSubClass = 0x02,
.bDeviceProtocol = 0x01, .bDeviceProtocol = 0x01,
......
...@@ -115,7 +115,7 @@ static struct usb_device_descriptor device_desc = { ...@@ -115,7 +115,7 @@ static struct usb_device_descriptor device_desc = {
.bLength = sizeof device_desc, .bLength = sizeof device_desc,
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = cpu_to_le16(0x0200), /* .bcdUSB = DYNAMIC */
.bDeviceClass = USB_CLASS_VENDOR_SPEC, .bDeviceClass = USB_CLASS_VENDOR_SPEC,
.idVendor = cpu_to_le16(DRIVER_VENDOR_NUM), .idVendor = cpu_to_le16(DRIVER_VENDOR_NUM),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment