diff options
author | Javier Martin <javier.martin@vista-silicon.com> | 2012-10-30 10:29:01 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-01-04 22:47:47 -0500 |
commit | 22f9a477a23b2e4fe85017920aaf4fd86a8a6660 (patch) | |
tree | f9e5b92fabc05b88ab2ee3209fdf7a58ed29f213 | |
parent | 9b556953224080d81754bfe764ab1899fc069edc (diff) |
[media] mx2_camera: Remove 'buf_cleanup' callback
All necessary tasks to end the streaming properly are
already implemented in mx2_stop_streaming() and nothing
remains to be done in this callback.
Furthermore, it only included debug messages so it can
be removed.
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>
-rw-r--r-- | drivers/media/platform/soc_camera/mx2_camera.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c index c0511c001be1..c93e790594ef 100644 --- a/drivers/media/platform/soc_camera/mx2_camera.c +++ b/drivers/media/platform/soc_camera/mx2_camera.c | |||
@@ -560,39 +560,6 @@ static void mx2_videobuf_queue(struct vb2_buffer *vb) | |||
560 | spin_unlock_irqrestore(&pcdev->lock, flags); | 560 | spin_unlock_irqrestore(&pcdev->lock, flags); |
561 | } | 561 | } |
562 | 562 | ||
563 | static void mx2_videobuf_release(struct vb2_buffer *vb) | ||
564 | { | ||
565 | #ifdef DEBUG | ||
566 | struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue); | ||
567 | struct soc_camera_host *ici = to_soc_camera_host(icd->parent); | ||
568 | struct mx2_camera_dev *pcdev = ici->priv; | ||
569 | struct mx2_buffer *buf = container_of(vb, struct mx2_buffer, vb); | ||
570 | |||
571 | dev_dbg(icd->parent, "%s (vb=0x%p) 0x%p %lu\n", __func__, | ||
572 | vb, vb2_plane_vaddr(vb, 0), vb2_get_plane_payload(vb, 0)); | ||
573 | |||
574 | switch (buf->state) { | ||
575 | case MX2_STATE_ACTIVE: | ||
576 | dev_info(icd->parent, "%s (active)\n", __func__); | ||
577 | break; | ||
578 | case MX2_STATE_QUEUED: | ||
579 | dev_info(icd->parent, "%s (queued)\n", __func__); | ||
580 | break; | ||
581 | default: | ||
582 | dev_info(icd->parent, "%s (unknown) %d\n", __func__, | ||
583 | buf->state); | ||
584 | break; | ||
585 | } | ||
586 | #endif | ||
587 | |||
588 | /* | ||
589 | * FIXME: implement forced termination of active buffers for mx27 and | ||
590 | * mx27 eMMA, so that the user won't get stuck in an uninterruptible | ||
591 | * state. This requires a specific handling for each of the these DMA | ||
592 | * types. | ||
593 | */ | ||
594 | } | ||
595 | |||
596 | static void mx27_camera_emma_buf_init(struct soc_camera_device *icd, | 563 | static void mx27_camera_emma_buf_init(struct soc_camera_device *icd, |
597 | int bytesperline) | 564 | int bytesperline) |
598 | { | 565 | { |
@@ -827,7 +794,6 @@ static struct vb2_ops mx2_videobuf_ops = { | |||
827 | .queue_setup = mx2_videobuf_setup, | 794 | .queue_setup = mx2_videobuf_setup, |
828 | .buf_prepare = mx2_videobuf_prepare, | 795 | .buf_prepare = mx2_videobuf_prepare, |
829 | .buf_queue = mx2_videobuf_queue, | 796 | .buf_queue = mx2_videobuf_queue, |
830 | .buf_cleanup = mx2_videobuf_release, | ||
831 | .start_streaming = mx2_start_streaming, | 797 | .start_streaming = mx2_start_streaming, |
832 | .stop_streaming = mx2_stop_streaming, | 798 | .stop_streaming = mx2_stop_streaming, |
833 | }; | 799 | }; |