diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2012-04-08 12:59:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-07 16:41:57 -0300 |
| commit | d1c07ef1135310940f4f49765f7e385aa847cff5 (patch) | |
| tree | 729d45808e0dec36c861c81cbe9e1cf2cb38823d | |
| parent | 805e9b4a06bf874c56e0811e9cca5e25cf465e42 (diff) | |
| download | op-kernel-dev-d1c07ef1135310940f4f49765f7e385aa847cff5.zip op-kernel-dev-d1c07ef1135310940f4f49765f7e385aa847cff5.tar.gz | |
[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>
| -rw-r--r-- | drivers/media/video/uvc/uvc_ctrl.c | 1 | ||||
| -rw-r--r-- | drivers/media/video/uvc/uvcvideo.h | 2 |
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 03212c7..28363b7 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, 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 777bb75..7c3d082 100644 --- 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]; |
