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, 0 insertions, 36 deletions

diff --git a/drivers/usb/gadget/uvc.h b/drivers/usb/gadget/uvc.h
index e92454cddd7d..5b7919460fd2 100644
--- a/drivers/usb/gadget/uvc.h
+++ b/drivers/usb/gadget/uvc.h
@@ -48,39 +48,6 @@ struct uvc_event
 #define UVC_INTF_STREAMING              1
 
 /* ------------------------------------------------------------------------
- * UVC constants & structures
- */
-
-/* Values for bmHeaderInfo (Video and Still Image Payload Headers, 2.4.3.3) */
-#define UVC_STREAM_EOH                          (1 << 7)
-#define UVC_STREAM_ERR                          (1 << 6)
-#define UVC_STREAM_STI                          (1 << 5)
-#define UVC_STREAM_RES                          (1 << 4)
-#define UVC_STREAM_SCR                          (1 << 3)
-#define UVC_STREAM_PTS                          (1 << 2)
-#define UVC_STREAM_EOF                          (1 << 1)
-#define UVC_STREAM_FID                          (1 << 0)
-
-struct uvc_streaming_control {
-        __u16 bmHint;
-        __u8  bFormatIndex;
-        __u8  bFrameIndex;
-        __u32 dwFrameInterval;
-        __u16 wKeyFrameRate;
-        __u16 wPFrameRate;
-        __u16 wCompQuality;
-        __u16 wCompWindowSize;
-        __u16 wDelay;
-        __u32 dwMaxVideoFrameSize;
-        __u32 dwMaxPayloadTransferSize;
-        __u32 dwClockFrequency;
-        __u8  bmFramingInfo;
-        __u8  bPreferedVersion;
-        __u8  bMinVersion;
-        __u8  bMaxVersion;
-} __attribute__((__packed__));
-
-/* ------------------------------------------------------------------------
  * Debugging, printing and logging
  */
 
@@ -137,9 +104,6 @@ extern unsigned int uvc_gadget_trace_param;
 #define UVC_MAX_REQUEST_SIZE                    64
 #define UVC_MAX_EVENTS                          4
 
-#define USB_DT_INTERFACE_ASSOCIATION_SIZE       8
-#define USB_CLASS_MISC                          0xef
-
 /* ------------------------------------------------------------------------
  * Structures
  */