[media] uvcvideo: Drop unused ctrl member from struct uvc_control_mapping

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c
index 03212c703330e6e3a6629b548859d7c79f8afbd3..28363b72ff8a983bf879952bb095f9f7b68709ee 100644 (file)
--- a/drivers/media/video/uvc/uvc_ctrl.c
+++ b/drivers/media/video/uvc/uvc_ctrl.c
@@ -1880,7 +1880,6 @@ static int __uvc_ctrl_add_mapping(struct uvc_device *dev,
        if (map->set == NULL)
                map->set = uvc_set_le_value;
 
-       map->ctrl = &ctrl->info;
        list_add_tail(&map->list, &ctrl->info.mappings);
        uvc_trace(UVC_TRACE_CONTROL,
                "Adding mapping '%s' to control %pUl/%u.\n",

diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h
index 777bb7505f8d8382daac6e1cd8c9ec25280edd4c..7c3d082505b78b6fc189fc631ee11cacab603447 100644 (file)
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -157,8 +157,6 @@ struct uvc_control_mapping {
        struct list_head list;
        struct list_head ev_subs;
 
-       struct uvc_control_info *ctrl;
-
        __u32 id;
        __u8 name[32];
        __u8 entity[16];