media: uvcvideo: Remove mappings form uvc_device_info

We do not have any quirk device making us of this. Remove from now. It
can be easily reverted later if needed.

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
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 2cc99a8b5c02868b886af178c1c24750f196ddc0..0136df5732bac5d6600f035641e07689e14782cd 100644 (file)
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -2676,32 +2676,7 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,
        if (!ctrl->initialized)
                return;
 
-       /*
-        * First check if the device provides a custom mapping for this control,
-        * used to override standard mappings for non-conformant devices. Don't
-        * process standard mappings if a custom mapping is found. This
-        * mechanism doesn't support combining standard and custom mappings for
-        * a single control.
-        */
-       if (chain->dev->info->mappings) {
-               bool custom = false;
-
-               for (i = 0; chain->dev->info->mappings[i]; ++i) {
-                       const struct uvc_control_mapping *mapping =
-                               chain->dev->info->mappings[i];
-
-                       if (uvc_entity_match_guid(ctrl->entity, mapping->entity) &&
-                           ctrl->info.selector == mapping->selector) {
-                               __uvc_ctrl_add_mapping(chain, ctrl, mapping);
-                               custom = true;
-                       }
-               }
-
-               if (custom)
-                       return;
-       }
-
-       /* Process common mappings next. */
+       /* Process common mappings. */
        for (i = 0; i < ARRAY_SIZE(uvc_ctrl_mappings); ++i) {
                const struct uvc_control_mapping *mapping = &uvc_ctrl_mappings[i];
 

diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index d84933294e2ac91c1ee7bccafa569e89e468452c..b7d24a853ce4f1d387795c0d159c519267e172ab 100644 (file)
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -531,7 +531,6 @@ struct uvc_device_info {
        u32     quirks;
        u32     meta_format;
        u16     uvc_version;
-       const struct uvc_control_mapping **mappings;
 };
 
 struct uvc_status_streaming {