diff options
| author | Laurent Pinchart <laurent.pinchart@linaro.org> | 2015-04-24 12:36:13 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@linaro.org> | 2015-04-28 21:03:02 +0300 |
| commit | 0de3cadda2c55b639ee1d18a52080f9efdfa5e90 (patch) | |
| tree | aee9d6c96c2ee83dc4bc3ec93049e49bcc0e228a | |
| parent | 6dc9893cada425938607beb6f0de19ba0fa82371 (diff) | |
media: mv-sc2: Remove mcam_dev.state field
The field is set but never read. Remove it.
Signed-off-by: Laurent Pinchart <laurent.pinchart@linaro.org>
Acked-By: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
| -rw-r--r-- | drivers/media/platform/soc_camera/mv_sc2_camera.c | 3 | ||||
| -rw-r--r-- | drivers/media/platform/soc_camera/mv_sc2_camera.h | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/media/platform/soc_camera/mv_sc2_camera.c b/drivers/media/platform/soc_camera/mv_sc2_camera.c index b5a1c1ada955..35ecc7bbc4dd 100644 --- a/drivers/media/platform/soc_camera/mv_sc2_camera.c +++ b/drivers/media/platform/soc_camera/mv_sc2_camera.c @@ -663,7 +663,6 @@ static int mccic_vb2_start_streaming(struct vb2_queue *vq, unsigned int count) ret = -EINVAL; goto done; } - mcam_dev->state = S_STREAMING; dma_dev->ops->shadow_ready(dma_dev); done: @@ -687,7 +686,6 @@ static void mccic_vb2_stop_streaming(struct vb2_queue *vq) spin_lock_irqsave(&mcam_dev->mcam_lock, flags); - mcam_dev->state = S_IDLE; dma_dev->ops->ccic_disable(dma_dev); ctrl_dev->ops->irq_mask(ctrl_dev, 0); ctrl_dev->ops->config_mbus(ctrl_dev, mcam_dev->bus_type, @@ -847,7 +845,6 @@ static int mccic_add_device(struct soc_camera_device *icd) sc2_pwr_ctrl(1, SC2_MOD_CCIC); icd->vb2_vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; - mcam_dev->state = S_IDLE; /* * Need sleep 1ms-2ms to wait for CCIC stable diff --git a/drivers/media/platform/soc_camera/mv_sc2_camera.h b/drivers/media/platform/soc_camera/mv_sc2_camera.h index 5d036a5f9813..9d4393e165fc 100644 --- a/drivers/media/platform/soc_camera/mv_sc2_camera.h +++ b/drivers/media/platform/soc_camera/mv_sc2_camera.h @@ -38,12 +38,6 @@ enum msc2_buffer_mode { B_DMA_SG = 1, }; -enum mcam_state { - S_IDLE, /* Just hanging around */ - S_STREAMING, /* Streaming data */ - S_BUFWAIT /* streaming requested but no buffers yet */ -}; - struct mv_camera_dev { struct soc_camera_host soc_host; struct soc_camera_device *icd; @@ -56,7 +50,6 @@ struct mv_camera_dev { struct ccic_ctrl_dev *ctrl_dev; struct msc2_mmu_dev *sc2_mmu; struct mcam_frame_stat frame_stats; /* Frame stats counter */ - enum mcam_state state; struct v4l2_pix_format_mplane mp; struct vb2_alloc_ctx *vb_alloc_ctx; enum v4l2_mbus_type bus_type; |