Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cde27a33 authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 54a445a4

drivers/media/platform/davinci/vpif_display.c

+0 −21
Original line number Diff line number Diff line
@@ -167,26 +167,6 @@ static void vpif_buffer_queue(struct vb2_buffer *vb) 
	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 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,

	.start_streaming	= vpif_start_streaming,

	.stop_streaming		= vpif_stop_streaming,

	.buf_cleanup		= vpif_buf_cleanup,

	.buf_queue		= vpif_buffer_queue,

};