media: uvcvideo: Cleanup version-specific mapping

We do not have more version specific mappings. Let's remove this code
for now. It can be easily reverted later if needed.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Ricardo Ribalda <ribalda@chromium.org>

diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index 1ce1caaccfb7662b7a9ee91e5dc5599a8de32fd6..024fa86ed2d5df9a5631b43ab3a51062c709c91b 100644 (file)
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -843,14 +843,6 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = {
        },
 };
 
-static const struct uvc_control_mapping *uvc_ctrl_mappings_uvc11[] = {
-       NULL, /* Sentinel */
-};
-
-static const struct uvc_control_mapping *uvc_ctrl_mappings_uvc15[] = {
-       NULL, /* Sentinel */
-};
-
 /* ------------------------------------------------------------------------
  * Utility functions
  */
@@ -2653,7 +2645,6 @@ static void uvc_ctrl_prune_entity(struct uvc_device *dev,
 static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,
                               struct uvc_control *ctrl)
 {
-       const struct uvc_control_mapping **mappings;
        unsigned int i;
 
        /*
@@ -2725,18 +2716,6 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,
                    ctrl->info.selector == mapping->selector)
                        __uvc_ctrl_add_mapping(chain, ctrl, mapping);
        }
-
-       /* Finally process version-specific mappings. */
-       mappings = chain->dev->uvc_version < 0x0150
-                ? uvc_ctrl_mappings_uvc11 : uvc_ctrl_mappings_uvc15;
-
-       for (i = 0; mappings[i]; ++i) {
-               const struct uvc_control_mapping *mapping = mappings[i];
-
-               if (uvc_entity_match_guid(ctrl->entity, mapping->entity) &&
-                   ctrl->info.selector == mapping->selector)
-                       __uvc_ctrl_add_mapping(chain, ctrl, mapping);
-       }
 }
 
 /*