V4L/DVB (12184): uvcvideo: Use class-specific descriptor types from usb/ch9.h

uvcvideo.h redefines class-specific descriptor types already present in
usb/ch9.h. Remove the duplicated definitions and use the ones from usb/ch9.h.

Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 2 insertions, 9 deletions

diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c
index 04b47832fa0a..bebc187846fa 100644
--- a/drivers/media/video/uvc/uvc_driver.c
+++ b/drivers/media/video/uvc/uvc_driver.c
@@ -644,7 +644,7 @@ static int uvc_parse_streaming(struct uvc_device *dev,
         _buflen = buflen;
 
         /* Count the format and frame descriptors. */
-        while (_buflen > 2 && _buffer[1] == CS_INTERFACE) {
+        while (_buflen > 2 && _buffer[1] == USB_DT_CS_INTERFACE) {
                 switch (_buffer[2]) {
                 case VS_FORMAT_UNCOMPRESSED:
                 case VS_FORMAT_MJPEG:
@@ -709,7 +709,7 @@ static int uvc_parse_streaming(struct uvc_device *dev,
         streaming->nformats = nformats;
 
         /* Parse the format descriptors. */
-        while (buflen > 2 && buffer[1] == CS_INTERFACE) {
+        while (buflen > 2 && buffer[1] == USB_DT_CS_INTERFACE) {
                 switch (buffer[2]) {
                 case VS_FORMAT_UNCOMPRESSED:
                 case VS_FORMAT_MJPEG:
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
index 3c78d3c1e4c0..8232cd5d7dfb 100644
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -79,13 +79,6 @@ struct uvc_xu_control {
 
 #define PC_PROTOCOL_UNDEFINED           0x00
 
-#define CS_UNDEFINED                    0x20
-#define CS_DEVICE                       0x21
-#define CS_CONFIGURATION                0x22
-#define CS_STRING                       0x23
-#define CS_INTERFACE                    0x24
-#define CS_ENDPOINT                     0x25
-
 /* VideoControl class specific interface descriptor */
 #define VC_DESCRIPTOR_UNDEFINED         0x00
 #define VC_HEADER                       0x01