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

Commit 36c0f8b3 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] vb2: replace void *alloc_ctxs by struct device *alloc_devs 



Make this a proper typed array. Drop the old allocate context code since
that is no longer used.

Note that the memops functions now get a struct device pointer instead of
the struct device ** that was there initially (actually a void pointer to
a struct containing only a struct device pointer).

This code is now a lot cleaner.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 2548fee6

drivers/input/touchscreen/sur40.c

+1 −1
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ static void sur40_disconnect(struct usb_interface *interface) 
 */

static int sur40_queue_setup(struct vb2_queue *q,

		       unsigned int *nbuffers, unsigned int *nplanes,

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

		       unsigned int sizes[], struct device *alloc_devs[])

{

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

		*nbuffers = 3 - q->num_buffers;

drivers/media/dvb-frontends/rtl2832_sdr.c

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

static int rtl2832_sdr_queue_setup(struct vb2_queue *vq,

		unsigned int *nbuffers,

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

		unsigned int *nplanes, unsigned int sizes[], struct device *alloc_devs[])

{

	struct rtl2832_sdr_dev *dev = vb2_get_drv_priv(vq);

	struct platform_device *pdev = dev->pdev;

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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static const struct v4l2_dv_timings cea1080p60 = V4L2_DV_BT_CEA_1920X1080P60; 


static int cobalt_queue_setup(struct vb2_queue *q,

			unsigned int *num_buffers, unsigned int *num_planes,

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

			unsigned int sizes[], struct device *alloc_devs[])

{

	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
@@ -1140,7 +1140,7 @@ static int cx23885_initialize_codec(struct cx23885_dev *dev, int startencoder) 


static int queue_setup(struct vb2_queue *q,

			   unsigned int *num_buffers, unsigned int *num_planes,

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

			   unsigned int sizes[], struct device *alloc_devs[])

{

	struct cx23885_dev *dev = q->drv_priv;

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

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); 


static int queue_setup(struct vb2_queue *q,

			   unsigned int *num_buffers, unsigned int *num_planes,

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

			   unsigned int sizes[], struct device *alloc_devs[])

{

	struct cx23885_tsport *port = q->drv_priv;