p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] media: davinci: vpif_display: drop buf_cleanup() callback 

this patch drops buf_cleanup() callback as this callback
is never called with buffer state active.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Lad, Prabhakar 2014-05-16 10:33:10 -03:00 committed by Mauro Carvalho Chehab
parent 54a445a41b
commit cde27a338a
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/media/platform/davinci/vpif_display.c
View File

@ -167,26 +167,6 @@ static void vpif_buffer_queue(struct vb2_buffer *vb)
spin_unlock_irqrestore(&common->irqlock, flags); spin_unlock_irqrestore(&common->irqlock, flags);
} }
/*
* vpif_buf_cleanup: This function is called from the videobuf2 layer to
* free memory allocated to the buffers
*/
static void vpif_buf_cleanup(struct vb2_buffer *vb)
{
struct vpif_disp_buffer *buf = container_of(vb,
struct vpif_disp_buffer, vb);
struct channel_obj *ch = vb2_get_drv_priv(vb->vb2_queue);
struct common_obj *common;
unsigned long flags;
common = &ch->common[VPIF_VIDEO_INDEX];
spin_lock_irqsave(&common->irqlock, flags);
if (vb->state == VB2_BUF_STATE_ACTIVE)
list_del_init(&buf->list);
spin_unlock_irqrestore(&common->irqlock, flags);
}
static u8 channel_first_int[VPIF_NUMOBJECTS][2] = { {1, 1} }; static u8 channel_first_int[VPIF_NUMOBJECTS][2] = { {1, 1} };
static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count) static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
@ -336,7 +316,6 @@ static struct vb2_ops video_qops = {
.buf_prepare = vpif_buffer_prepare, .buf_prepare = vpif_buffer_prepare,
.start_streaming = vpif_start_streaming, .start_streaming = vpif_start_streaming,
.stop_streaming = vpif_stop_streaming, .stop_streaming = vpif_stop_streaming,
.buf_cleanup = vpif_buf_cleanup,
.buf_queue = vpif_buffer_queue, .buf_queue = vpif_buffer_queue,
}; };