diff options
author | Javier Martin <javier.martin@vista-silicon.com> | 2012-10-30 10:29:02 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-01-04 22:48:06 -0500 |
commit | 3fdd97973b357255c291beaad5cdf6255d3ff936 (patch) | |
tree | 24c7828396835f951be9d29b2d13e5dc49fd8c53 /drivers/media/platform/soc_camera | |
parent | 22f9a477a23b2e4fe85017920aaf4fd86a8a6660 (diff) |
[media] mx2_camera: Remove buffer states
After removing i.mx25 support and buf_cleanup() callback,
buffer states are not used in the code any longer.
Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/soc_camera')
-rw-r--r-- | drivers/media/platform/soc_camera/mx2_camera.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c index c93e790594ef..188541ac355a 100644 --- a/drivers/media/platform/soc_camera/mx2_camera.c +++ b/drivers/media/platform/soc_camera/mx2_camera.c | |||
@@ -216,12 +216,6 @@ struct mx2_fmt_cfg { | |||
216 | struct mx2_prp_cfg cfg; | 216 | struct mx2_prp_cfg cfg; |
217 | }; | 217 | }; |
218 | 218 | ||
219 | enum mx2_buffer_state { | ||
220 | MX2_STATE_QUEUED, | ||
221 | MX2_STATE_ACTIVE, | ||
222 | MX2_STATE_DONE, | ||
223 | }; | ||
224 | |||
225 | struct mx2_buf_internal { | 219 | struct mx2_buf_internal { |
226 | struct list_head queue; | 220 | struct list_head queue; |
227 | int bufnum; | 221 | int bufnum; |
@@ -232,7 +226,6 @@ struct mx2_buf_internal { | |||
232 | struct mx2_buffer { | 226 | struct mx2_buffer { |
233 | /* common v4l buffer stuff -- must be first */ | 227 | /* common v4l buffer stuff -- must be first */ |
234 | struct vb2_buffer vb; | 228 | struct vb2_buffer vb; |
235 | enum mx2_buffer_state state; | ||
236 | struct mx2_buf_internal internal; | 229 | struct mx2_buf_internal internal; |
237 | }; | 230 | }; |
238 | 231 | ||
@@ -554,7 +547,6 @@ static void mx2_videobuf_queue(struct vb2_buffer *vb) | |||
554 | 547 | ||
555 | spin_lock_irqsave(&pcdev->lock, flags); | 548 | spin_lock_irqsave(&pcdev->lock, flags); |
556 | 549 | ||
557 | buf->state = MX2_STATE_QUEUED; | ||
558 | list_add_tail(&buf->internal.queue, &pcdev->capture); | 550 | list_add_tail(&buf->internal.queue, &pcdev->capture); |
559 | 551 | ||
560 | spin_unlock_irqrestore(&pcdev->lock, flags); | 552 | spin_unlock_irqrestore(&pcdev->lock, flags); |
@@ -678,7 +670,6 @@ static int mx2_start_streaming(struct vb2_queue *q, unsigned int count) | |||
678 | internal.queue); | 670 | internal.queue); |
679 | buf->internal.bufnum = 0; | 671 | buf->internal.bufnum = 0; |
680 | vb = &buf->vb; | 672 | vb = &buf->vb; |
681 | buf->state = MX2_STATE_ACTIVE; | ||
682 | 673 | ||
683 | phys = vb2_dma_contig_plane_dma_addr(vb, 0); | 674 | phys = vb2_dma_contig_plane_dma_addr(vb, 0); |
684 | mx27_update_emma_buf(pcdev, phys, buf->internal.bufnum); | 675 | mx27_update_emma_buf(pcdev, phys, buf->internal.bufnum); |
@@ -688,7 +679,6 @@ static int mx2_start_streaming(struct vb2_queue *q, unsigned int count) | |||
688 | internal.queue); | 679 | internal.queue); |
689 | buf->internal.bufnum = 1; | 680 | buf->internal.bufnum = 1; |
690 | vb = &buf->vb; | 681 | vb = &buf->vb; |
691 | buf->state = MX2_STATE_ACTIVE; | ||
692 | 682 | ||
693 | phys = vb2_dma_contig_plane_dma_addr(vb, 0); | 683 | phys = vb2_dma_contig_plane_dma_addr(vb, 0); |
694 | mx27_update_emma_buf(pcdev, phys, buf->internal.bufnum); | 684 | mx27_update_emma_buf(pcdev, phys, buf->internal.bufnum); |
@@ -1382,7 +1372,6 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev, | |||
1382 | list_move_tail(pcdev->capture.next, &pcdev->active_bufs); | 1372 | list_move_tail(pcdev->capture.next, &pcdev->active_bufs); |
1383 | 1373 | ||
1384 | vb = &buf->vb; | 1374 | vb = &buf->vb; |
1385 | buf->state = MX2_STATE_ACTIVE; | ||
1386 | 1375 | ||
1387 | phys = vb2_dma_contig_plane_dma_addr(vb, 0); | 1376 | phys = vb2_dma_contig_plane_dma_addr(vb, 0); |
1388 | mx27_update_emma_buf(pcdev, phys, bufnum); | 1377 | mx27_update_emma_buf(pcdev, phys, bufnum); |