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

Commit 527f18be authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab
Browse files

[media] Staging: dt3155v4l: update to newer API 



I changed the function definitions for dt3155_queue_setup() to match the
newer API.  The dt3155_start_streaming() function didn't do anything so
I just removed it.

This silences the following gcc warnings:
drivers/staging/media/dt3155v4l/dt3155v4l.c:307:2: warning: initialization from incompatible pointer type [enabled by default]
drivers/staging/media/dt3155v4l/dt3155v4l.c:307:2: warning: (near initialization for ‘q_ops.queue_setup’) [enabled by default]
drivers/staging/media/dt3155v4l/dt3155v4l.c:311:2: warning: initialization from incompatible pointer type [enabled by default]
drivers/staging/media/dt3155v4l/dt3155v4l.c:311:2: warning: (near initialization for ‘q_ops.start_streaming’) [enabled by default]

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ccd1a499

drivers/staging/media/dt3155v4l/dt3155v4l.c

+4 −10
Original line number Diff line number Diff line
@@ -218,9 +218,10 @@ dt3155_start_acq(struct dt3155_priv *pd) 
 *	driver-specific callbacks (vb2_ops)

 */

static int

dt3155_queue_setup(struct vb2_queue *q, unsigned int *num_buffers,

			unsigned int *num_planes, unsigned long sizes[],

						void *alloc_ctxs[])

dt3155_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,

		unsigned int *num_buffers, unsigned int *num_planes,

		unsigned int sizes[], void *alloc_ctxs[])



{

	struct dt3155_priv *pd = vb2_get_drv_priv(q);

	void *ret;
@@ -261,12 +262,6 @@ dt3155_buf_prepare(struct vb2_buffer *vb) 
	return 0;

}



static int

dt3155_start_streaming(struct vb2_queue *q)

{

	return 0;

}



static int

dt3155_stop_streaming(struct vb2_queue *q)

{
@@ -308,7 +303,6 @@ const struct vb2_ops q_ops = { 
	.wait_prepare = dt3155_wait_prepare,

	.wait_finish = dt3155_wait_finish,

	.buf_prepare = dt3155_buf_prepare,

	.start_streaming = dt3155_start_streaming,

	.stop_streaming = dt3155_stop_streaming,

	.buf_queue = dt3155_buf_queue,

};