diff options
| -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 073e72c..83c1451 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) clear_bit(CF_DMA_ACTIVE, &cam->flags); cam->next_buf = frame; cam->buf_seq[frame] = ++(cam->sequence); - cam->last_delivered = frame; frames++; /* * "This should never happen" @@ -1741,7 +1740,6 @@ int mccic_register(struct mcam_camera *cam) mcam_set_config_needed(cam, 1); cam->pix_format = mcam_def_pix_format; cam->mbus_code = mcam_def_mbus_code; - INIT_LIST_HEAD(&cam->dev_list); INIT_LIST_HEAD(&cam->buffers); mcam_ctlr_init(cam); diff --git a/drivers/media/video/marvell-ccic/mcam-core.h b/drivers/media/video/marvell-ccic/mcam-core.h index aa55255..917200e 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 { struct v4l2_subdev *sensor; unsigned short sensor_addr; - struct list_head dev_list; /* link to other devices */ - /* Videobuf2 stuff */ struct vb2_queue vb_queue; struct list_head buffers; /* Available frames */ @@ -138,7 +136,6 @@ struct mcam_camera { /* DMA buffers - DMA modes */ struct mcam_vb_buffer *vb_bufs[MAX_DMA_BUFS]; struct vb2_alloc_ctx *vb_alloc_ctx; - unsigned short last_delivered; /* Mode-specific ops, set at open time */ void (*dma_setup)(struct mcam_camera *cam); |