Commit e9bcf667 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7376): Improve compile-time type-checking in videobuf 



Make the dev member of the struct videobuf_queue of type "struct device *"
to avoid future problems. Also change the prototype of the
videobuf_queue_core_init() function.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 50407f99

drivers/media/video/videobuf-core.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int videobuf_iolock(struct videobuf_queue *q, struct videobuf_buffer *vb, 


void videobuf_queue_core_init(struct videobuf_queue *q,

			 struct videobuf_queue_ops *ops,

			 void *dev,

			 struct device *dev,

			 spinlock_t *irqlock,

			 enum v4l2_buf_type type,

			 enum v4l2_field field,

include/media/videobuf-core.h

+2 −2
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ struct videobuf_qtype_ops { 
struct videobuf_queue {

	struct mutex               vb_lock;

	spinlock_t                 *irqlock;

	void			   *dev; /* on pci, points to struct pci_dev */

	struct device		   *dev;



	enum v4l2_buf_type         type;

	unsigned int               inputs; /* for V4L2_BUF_FLAG_INPUT */
@@ -185,7 +185,7 @@ void *videobuf_alloc(struct videobuf_queue* q); 


void videobuf_queue_core_init(struct videobuf_queue *q,

			 struct videobuf_queue_ops *ops,

			 void *dev,

			 struct device *dev,

			 spinlock_t *irqlock,

			 enum v4l2_buf_type type,

			 enum v4l2_field field,