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

Commit 33119e80 authored by Junghak Sung's avatar Junghak Sung Committed by Mauro Carvalho Chehab
Browse files

[media] media: videobuf2: Change queue_setup argument 



Replace struct v4l2_format * with void * to make queue_setup()
for common use.
And then, modify all device drivers related with this change.

Signed-off-by: default avatarJunghak Sung <jh1009.sung@samsung.com>
Signed-off-by: default avatarGeunyoung Kim <nenggun.kim@samsung.com>
Acked-by: default avatarSeung-Woo Kim <sw0312.kim@samsung.com>
Acked-by: default avatarInki Dae <inki.dae@samsung.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
[hans.verkuil@cisco.com: fix missing const in fimc-lite.c]

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 4d0b0ed6

Documentation/video4linux/v4l2-pci-skeleton.c

+3 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <media/v4l2-dv-timings.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-event.h>

#include <media/videobuf2-v4l2.h>

#include <media/videobuf2-dma-contig.h>



MODULE_DESCRIPTION("V4L2 PCI Skeleton Driver");
@@ -162,10 +163,11 @@ static irqreturn_t skeleton_irq(int irq, void *dev_id) 
 * minimum number: many DMA engines need a minimum of 2 buffers in the

 * queue and you need to have another available for userspace processing.

 */

static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,

static int queue_setup(struct vb2_queue *vq, const void *parg,

		       unsigned int *nbuffers, unsigned int *nplanes,

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

{

	const struct v4l2_format *fmt = parg;

	struct skeleton *skel = vb2_get_drv_priv(vq);



	skel->field = skel->format.field;

drivers/input/touchscreen/sur40.c

+2 −1
Original line number Diff line number Diff line
@@ -644,10 +644,11 @@ static void sur40_disconnect(struct usb_interface *interface) 
 * minimum number: many DMA engines need a minimum of 2 buffers in the

 * queue and you need to have another available for userspace processing.

 */

static int sur40_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,

static int sur40_queue_setup(struct vb2_queue *q, const void *parg,

		       unsigned int *nbuffers, unsigned int *nplanes,

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

{

	const struct v4l2_format *fmt = parg;

	struct sur40_state *sur40 = vb2_get_drv_priv(q);



	if (q->num_buffers + *nbuffers < 3)

drivers/media/dvb-frontends/rtl2832_sdr.c

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static int rtl2832_sdr_querycap(struct file *file, void *fh, 


/* Videobuf2 operations */

static int rtl2832_sdr_queue_setup(struct vb2_queue *vq,

		const struct v4l2_format *fmt, unsigned int *nbuffers,

		const void *parg, unsigned int *nbuffers,

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

{

	struct rtl2832_sdr_dev *dev = vb2_get_drv_priv(vq);

drivers/media/pci/cobalt/cobalt-v4l2.c

+2 −2
Original line number Diff line number Diff line
@@ -43,11 +43,11 @@ static const struct v4l2_dv_timings cea1080p60 = V4L2_DV_BT_CEA_1920X1080P60; 


/* vb2 DMA streaming ops */



static int cobalt_queue_setup(struct vb2_queue *q,

			const struct v4l2_format *fmt,

static int cobalt_queue_setup(struct vb2_queue *q, const void *parg,

			unsigned int *num_buffers, unsigned int *num_planes,

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

{

	const struct v4l2_format *fmt = parg;

	struct cobalt_stream *s = q->drv_priv;

	unsigned size = s->stride * s->height;

drivers/media/pci/cx23885/cx23885-417.c

+1 −1
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ static int cx23885_initialize_codec(struct cx23885_dev *dev, int startencoder) 


/* ------------------------------------------------------------------ */



static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,

static int queue_setup(struct vb2_queue *q, const void *parg,

			   unsigned int *num_buffers, unsigned int *num_planes,

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

{