diff options
author | Jonathan Corbet <corbet@lwn.net> | 2011-07-08 16:50:50 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:55:54 -0400 |
commit | 9f26392a6afbb8ecf9d19037f137162142c8f04b (patch) | |
tree | 010a0f34b94fcff482b3c0f8e352c14c63070c87 /drivers/media/video | |
parent | 7498469f619e1ba380fc90042a2b1736c7c6942c (diff) |
[media] marvell-cam: clean up a couple of unused cam structure fields
Delete a couple of leftover fields whose time has passed.
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/marvell-ccic/mcam-core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/marvell-ccic/mcam-core.h | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/video/marvell-ccic/mcam-core.c b/drivers/media/video/marvell-ccic/mcam-core.c index 073e72c8f08b..83c14514cd52 100644 --- a/drivers/media/video/marvell-ccic/mcam-core.c +++ b/drivers/media/video/marvell-ccic/mcam-core.c | |||
@@ -1638,7 +1638,6 @@ static void mcam_frame_complete(struct mcam_camera *cam, int frame) | |||
1638 | clear_bit(CF_DMA_ACTIVE, &cam->flags); | 1638 | clear_bit(CF_DMA_ACTIVE, &cam->flags); |
1639 | cam->next_buf = frame; | 1639 | cam->next_buf = frame; |
1640 | cam->buf_seq[frame] = ++(cam->sequence); | 1640 | cam->buf_seq[frame] = ++(cam->sequence); |
1641 | cam->last_delivered = frame; | ||
1642 | frames++; | 1641 | frames++; |
1643 | /* | 1642 | /* |
1644 | * "This should never happen" | 1643 | * "This should never happen" |
@@ -1741,7 +1740,6 @@ int mccic_register(struct mcam_camera *cam) | |||
1741 | mcam_set_config_needed(cam, 1); | 1740 | mcam_set_config_needed(cam, 1); |
1742 | cam->pix_format = mcam_def_pix_format; | 1741 | cam->pix_format = mcam_def_pix_format; |
1743 | cam->mbus_code = mcam_def_mbus_code; | 1742 | cam->mbus_code = mcam_def_mbus_code; |
1744 | INIT_LIST_HEAD(&cam->dev_list); | ||
1745 | INIT_LIST_HEAD(&cam->buffers); | 1743 | INIT_LIST_HEAD(&cam->buffers); |
1746 | mcam_ctlr_init(cam); | 1744 | mcam_ctlr_init(cam); |
1747 | 1745 | ||
diff --git a/drivers/media/video/marvell-ccic/mcam-core.h b/drivers/media/video/marvell-ccic/mcam-core.h index aa5525537232..917200e63255 100644 --- a/drivers/media/video/marvell-ccic/mcam-core.h +++ b/drivers/media/video/marvell-ccic/mcam-core.h | |||
@@ -116,8 +116,6 @@ struct mcam_camera { | |||
116 | struct v4l2_subdev *sensor; | 116 | struct v4l2_subdev *sensor; |
117 | unsigned short sensor_addr; | 117 | unsigned short sensor_addr; |
118 | 118 | ||
119 | struct list_head dev_list; /* link to other devices */ | ||
120 | |||
121 | /* Videobuf2 stuff */ | 119 | /* Videobuf2 stuff */ |
122 | struct vb2_queue vb_queue; | 120 | struct vb2_queue vb_queue; |
123 | struct list_head buffers; /* Available frames */ | 121 | struct list_head buffers; /* Available frames */ |
@@ -138,7 +136,6 @@ struct mcam_camera { | |||
138 | /* DMA buffers - DMA modes */ | 136 | /* DMA buffers - DMA modes */ |
139 | struct mcam_vb_buffer *vb_bufs[MAX_DMA_BUFS]; | 137 | struct mcam_vb_buffer *vb_bufs[MAX_DMA_BUFS]; |
140 | struct vb2_alloc_ctx *vb_alloc_ctx; | 138 | struct vb2_alloc_ctx *vb_alloc_ctx; |
141 | unsigned short last_delivered; | ||
142 | 139 | ||
143 | /* Mode-specific ops, set at open time */ | 140 | /* Mode-specific ops, set at open time */ |
144 | void (*dma_setup)(struct mcam_camera *cam); | 141 | void (*dma_setup)(struct mcam_camera *cam); |