Commit 9f26392a authored by Jonathan Corbet's avatar Jonathan Corbet Committed by Mauro Carvalho Chehab

[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: default avatarJonathan Corbet <corbet@lwn.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7498469f
...@@ -1638,7 +1638,6 @@ static void mcam_frame_complete(struct mcam_camera *cam, int frame) ...@@ -1638,7 +1638,6 @@ static void mcam_frame_complete(struct mcam_camera *cam, int frame)
clear_bit(CF_DMA_ACTIVE, &cam->flags); clear_bit(CF_DMA_ACTIVE, &cam->flags);
cam->next_buf = frame; cam->next_buf = frame;
cam->buf_seq[frame] = ++(cam->sequence); cam->buf_seq[frame] = ++(cam->sequence);
cam->last_delivered = frame;
frames++; frames++;
/* /*
* "This should never happen" * "This should never happen"
...@@ -1741,7 +1740,6 @@ int mccic_register(struct mcam_camera *cam) ...@@ -1741,7 +1740,6 @@ int mccic_register(struct mcam_camera *cam)
mcam_set_config_needed(cam, 1); mcam_set_config_needed(cam, 1);
cam->pix_format = mcam_def_pix_format; cam->pix_format = mcam_def_pix_format;
cam->mbus_code = mcam_def_mbus_code; cam->mbus_code = mcam_def_mbus_code;
INIT_LIST_HEAD(&cam->dev_list);
INIT_LIST_HEAD(&cam->buffers); INIT_LIST_HEAD(&cam->buffers);
mcam_ctlr_init(cam); mcam_ctlr_init(cam);
......
...@@ -116,8 +116,6 @@ struct mcam_camera { ...@@ -116,8 +116,6 @@ struct mcam_camera {
struct v4l2_subdev *sensor; struct v4l2_subdev *sensor;
unsigned short sensor_addr; unsigned short sensor_addr;
struct list_head dev_list; /* link to other devices */
/* Videobuf2 stuff */ /* Videobuf2 stuff */
struct vb2_queue vb_queue; struct vb2_queue vb_queue;
struct list_head buffers; /* Available frames */ struct list_head buffers; /* Available frames */
...@@ -138,7 +136,6 @@ struct mcam_camera { ...@@ -138,7 +136,6 @@ struct mcam_camera {
/* DMA buffers - DMA modes */ /* DMA buffers - DMA modes */
struct mcam_vb_buffer *vb_bufs[MAX_DMA_BUFS]; struct mcam_vb_buffer *vb_bufs[MAX_DMA_BUFS];
struct vb2_alloc_ctx *vb_alloc_ctx; struct vb2_alloc_ctx *vb_alloc_ctx;
unsigned short last_delivered;
/* Mode-specific ops, set at open time */ /* Mode-specific ops, set at open time */
void (*dma_setup)(struct mcam_camera *cam); void (*dma_setup)(struct mcam_camera *cam);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment