aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@pengutronix.de>2008-04-22 13:46:02 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:07:51 -0400
commite9bcf6675d6da1a1e9925b2bdfc21f8d2330a1c5 (patch)
treebd22320636bb263366882256675af5f8a690d5d6 /include/media
parent50407f99a1fd7fcca74e53b1852dc70deb5114db (diff)
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: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/videobuf-core.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h
index 99033945cdee..fcdffdd63304 100644
--- a/include/media/videobuf-core.h
+++ b/include/media/videobuf-core.h
@@ -151,7 +151,7 @@ struct videobuf_qtype_ops {
151struct videobuf_queue { 151struct videobuf_queue {
152 struct mutex vb_lock; 152 struct mutex vb_lock;
153 spinlock_t *irqlock; 153 spinlock_t *irqlock;
154 void *dev; /* on pci, points to struct pci_dev */ 154 struct device *dev;
155 155
156 enum v4l2_buf_type type; 156 enum v4l2_buf_type type;
157 unsigned int inputs; /* for V4L2_BUF_FLAG_INPUT */ 157 unsigned int inputs; /* for V4L2_BUF_FLAG_INPUT */
@@ -185,7 +185,7 @@ void *videobuf_alloc(struct videobuf_queue* q);
185 185
186void videobuf_queue_core_init(struct videobuf_queue *q, 186void videobuf_queue_core_init(struct videobuf_queue *q,
187 struct videobuf_queue_ops *ops, 187 struct videobuf_queue_ops *ops,
188 void *dev, 188 struct device *dev,
189 spinlock_t *irqlock, 189 spinlock_t *irqlock,
190 enum v4l2_buf_type type, 190 enum v4l2_buf_type type,
191 enum v4l2_field field, 191 enum v4l2_field field,