aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/uvc
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2012-04-08 11:59:54 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-07 15:41:57 -0400
commitd1c07ef1135310940f4f49765f7e385aa847cff5 (patch)
tree729d45808e0dec36c861c81cbe9e1cf2cb38823d /drivers/media/video/uvc
parent805e9b4a06bf874c56e0811e9cca5e25cf465e42 (diff)
[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>
Diffstat (limited to 'drivers/media/video/uvc')
-rw-r--r--drivers/media/video/uvc/uvc_ctrl.c1
-rw-r--r--drivers/media/video/uvc/uvcvideo.h2
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c
index 03212c703330..28363b72ff8a 100644
--- 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,
1880 if (map->set == NULL) 1880 if (map->set == NULL)
1881 map->set = uvc_set_le_value; 1881 map->set = uvc_set_le_value;
1882 1882
1883 map->ctrl = &ctrl->info;
1884 list_add_tail(&map->list, &ctrl->info.mappings); 1883 list_add_tail(&map->list, &ctrl->info.mappings);
1885 uvc_trace(UVC_TRACE_CONTROL, 1884 uvc_trace(UVC_TRACE_CONTROL,
1886 "Adding mapping '%s' to control %pUl/%u.\n", 1885 "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 777bb7505f8d..7c3d082505b7 100644
--- a/drivers/media/video/uvc/uvcvideo.h
+++ b/drivers/media/video/uvc/uvcvideo.h
@@ -157,8 +157,6 @@ struct uvc_control_mapping {
157 struct list_head list; 157 struct list_head list;
158 struct list_head ev_subs; 158 struct list_head ev_subs;
159 159
160 struct uvc_control_info *ctrl;
161
162 __u32 id; 160 __u32 id;
163 __u8 name[32]; 161 __u8 name[32];
164 __u8 entity[16]; 162 __u8 entity[16];