V4L/DVB: uvc: Move constants and structures definitions to linux/usb/video.h

The UVC host and gadget drivers both define constants and structures in
private header files. Move all those definitions to linux/usb/video.h
where they can be shared by the two drivers (and be available for
userspace applications).

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/usb/gadget/f_uvc.c b/drivers/usb/gadget/f_uvc.c
index dbe6db0184fd..be446b7e7eaa 100644
--- a/drivers/usb/gadget/f_uvc.c
+++ b/drivers/usb/gadget/f_uvc.c
@@ -61,12 +61,12 @@ static struct usb_gadget_strings *uvc_function_strings[] = {
 #define UVC_INTF_VIDEO_STREAMING                1
 
 static struct usb_interface_assoc_descriptor uvc_iad __initdata = {
-        .bLength                = USB_DT_INTERFACE_ASSOCIATION_SIZE,
+        .bLength                = sizeof(uvc_iad),
         .bDescriptorType        = USB_DT_INTERFACE_ASSOCIATION,
         .bFirstInterface        = 0,
         .bInterfaceCount        = 2,
         .bFunctionClass         = USB_CLASS_VIDEO,
-        .bFunctionSubClass      = 0x03,
+        .bFunctionSubClass      = UVC_SC_VIDEO_INTERFACE_COLLECTION,
         .bFunctionProtocol      = 0x00,
         .iFunction              = 0,
 };
@@ -78,7 +78,7 @@ static struct usb_interface_descriptor uvc_control_intf __initdata = {
         .bAlternateSetting      = 0,
         .bNumEndpoints          = 1,
         .bInterfaceClass        = USB_CLASS_VIDEO,
-        .bInterfaceSubClass     = 0x01,
+        .bInterfaceSubClass     = UVC_SC_VIDEOCONTROL,
         .bInterfaceProtocol     = 0x00,
         .iInterface             = 0,
 };
@@ -106,7 +106,7 @@ static struct usb_interface_descriptor uvc_streaming_intf_alt0 __initdata = {
         .bAlternateSetting      = 0,
         .bNumEndpoints          = 0,
         .bInterfaceClass        = USB_CLASS_VIDEO,
-        .bInterfaceSubClass     = 0x02,
+        .bInterfaceSubClass     = UVC_SC_VIDEOSTREAMING,
         .bInterfaceProtocol     = 0x00,
         .iInterface             = 0,
 };
@@ -118,7 +118,7 @@ static struct usb_interface_descriptor uvc_streaming_intf_alt1 __initdata = {
         .bAlternateSetting      = 1,
         .bNumEndpoints          = 1,
         .bInterfaceClass        = USB_CLASS_VIDEO,
-        .bInterfaceSubClass     = 0x02,
+        .bInterfaceSubClass     = UVC_SC_VIDEOSTREAMING,
         .bInterfaceProtocol     = 0x00,
         .iInterface             = 0,
 };
@@ -603,15 +603,15 @@ uvc_bind_config(struct usb_configuration *c,
 
         /* Validate the descriptors. */
         if (control == NULL || control[0] == NULL ||
-            control[0]->bDescriptorSubType != UVC_DT_HEADER)
+            control[0]->bDescriptorSubType != UVC_VC_HEADER)
                 goto error;
 
         if (fs_streaming == NULL || fs_streaming[0] == NULL ||
-            fs_streaming[0]->bDescriptorSubType != UVC_DT_INPUT_HEADER)
+            fs_streaming[0]->bDescriptorSubType != UVC_VS_INPUT_HEADER)
                 goto error;
 
         if (hs_streaming == NULL || hs_streaming[0] == NULL ||
-            hs_streaming[0]->bDescriptorSubType != UVC_DT_INPUT_HEADER)
+            hs_streaming[0]->bDescriptorSubType != UVC_VS_INPUT_HEADER)
                 goto error;
 
         uvc->desc.control = control;