From 1d0e594b275ca399724052ced995120d5f17326f Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Mon, 8 Oct 2007 12:20:02 -0300
Subject: [PATCH] --- yaml --- r: 65951 b: refs/heads/master c:
 d4cae5a50021271b9ef4e5e39e71e177d12fa8cb h: refs/heads/master i:   65949:
 12e6bc5c44bea9f2b8576c9e57ff6324ed7186fe   65947:
 a49328fac5aeccf1671c2b11b0674544aa2bbba9   65943:
 543d298709fa3b79a55e551c022dedf7417391f7   65935:
 1ec845143ab47ee5cbfbfd5957121cd374c898da   65919:
 03f4bdcbacc7cc44736d1a1c9a7ff9e5491dbd00 v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/media/video/videobuf-core.c    | 23 ++++++++++++--------
 trunk/drivers/media/video/videobuf-dma-sg.c  |  4 ++--
 trunk/drivers/media/video/videobuf-vmalloc.c |  4 ++--
 trunk/include/media/videobuf-core.h          |  5 +++--
 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index c3dc48e7dcc5..23a222824534 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5f1b01644b6fd5e9eb480a4762cd6b569cb1246
+refs/heads/master: d4cae5a50021271b9ef4e5e39e71e177d12fa8cb
diff --git a/trunk/drivers/media/video/videobuf-core.c b/trunk/drivers/media/video/videobuf-core.c
index aa402abc4b0c..f5c5ea8b6b08 100644
--- a/trunk/drivers/media/video/videobuf-core.c
+++ b/trunk/drivers/media/video/videobuf-core.c
@@ -108,23 +108,25 @@ int videobuf_iolock(struct videobuf_queue* q, struct videobuf_buffer *vb,
 /* --------------------------------------------------------------------- */
 
 
-void videobuf_queue_init(struct videobuf_queue* q,
+void videobuf_queue_core_init(struct videobuf_queue* q,
 			 struct videobuf_queue_ops *ops,
 			 void *dev,
 			 spinlock_t *irqlock,
 			 enum v4l2_buf_type type,
 			 enum v4l2_field field,
 			 unsigned int msize,
-			 void *priv)
+			 void *priv,
+			 struct videobuf_qtype_ops *int_ops)
 {
 	memset(q,0,sizeof(*q));
-	q->irqlock = irqlock;
-	q->dev     = dev;
-	q->type    = type;
-	q->field   = field;
-	q->msize   = msize;
-	q->ops     = ops;
+	q->irqlock   = irqlock;
+	q->dev       = dev;
+	q->type      = type;
+	q->field     = field;
+	q->msize     = msize;
+	q->ops       = ops;
 	q->priv_data = priv;
+	q->int_ops   = int_ops;
 
 	/* All buffer operations are mandatory */
 	BUG_ON (!q->ops->buf_setup);
@@ -132,6 +134,9 @@ void videobuf_queue_init(struct videobuf_queue* q,
 	BUG_ON (!q->ops->buf_queue);
 	BUG_ON (!q->ops->buf_release);
 
+	/* Having implementations for abstract methods are mandatory */
+	BUG_ON (!q->int_ops);
+
 	mutex_init(&q->lock);
 	INIT_LIST_HEAD(&q->stream);
 }
@@ -966,7 +971,7 @@ EXPORT_SYMBOL_GPL(videobuf_iolock);
 
 EXPORT_SYMBOL_GPL(videobuf_alloc);
 
-EXPORT_SYMBOL_GPL(videobuf_queue_init);
+EXPORT_SYMBOL_GPL(videobuf_queue_core_init);
 EXPORT_SYMBOL_GPL(videobuf_queue_cancel);
 EXPORT_SYMBOL_GPL(videobuf_queue_is_busy);
 
diff --git a/trunk/drivers/media/video/videobuf-dma-sg.c b/trunk/drivers/media/video/videobuf-dma-sg.c
index a38efe10feb4..8bb7fdd306d6 100644
--- a/trunk/drivers/media/video/videobuf-dma-sg.c
+++ b/trunk/drivers/media/video/videobuf-dma-sg.c
@@ -695,8 +695,8 @@ void videobuf_queue_pci_init(struct videobuf_queue* q,
 			 unsigned int msize,
 			 void *priv)
 {
-	videobuf_queue_init(q, ops, dev, irqlock, type, field, msize, priv);
-	q->int_ops=&pci_ops;
+	videobuf_queue_core_init(q, ops, dev, irqlock, type, field, msize,
+				 priv, &pci_ops);
 }
 
 /* --------------------------------------------------------------------- */
diff --git a/trunk/drivers/media/video/videobuf-vmalloc.c b/trunk/drivers/media/video/videobuf-vmalloc.c
index c9d6ae0d3b49..2e3689a12a28 100644
--- a/trunk/drivers/media/video/videobuf-vmalloc.c
+++ b/trunk/drivers/media/video/videobuf-vmalloc.c
@@ -333,8 +333,8 @@ void videobuf_queue_vmalloc_init(struct videobuf_queue* q,
 			 unsigned int msize,
 			 void *priv)
 {
-	videobuf_queue_init(q, ops, dev, irqlock, type, field, msize, priv);
-	q->int_ops=&qops;
+	videobuf_queue_core_init(q, ops, dev, irqlock, type, field, msize,
+				 priv, &qops);
 }
 
 EXPORT_SYMBOL_GPL(videobuf_queue_vmalloc_init);
diff --git a/trunk/include/media/videobuf-core.h b/trunk/include/media/videobuf-core.h
index 9bae5a2eda66..9fa09fb800a1 100644
--- a/trunk/include/media/videobuf-core.h
+++ b/trunk/include/media/videobuf-core.h
@@ -181,14 +181,15 @@ int videobuf_iolock(struct videobuf_queue* q, struct videobuf_buffer *vb,
 
 void *videobuf_alloc(struct videobuf_queue* q);
 
-void videobuf_queue_init(struct videobuf_queue *q,
+void videobuf_queue_core_init(struct videobuf_queue *q,
 			 struct videobuf_queue_ops *ops,
 			 void *dev,
 			 spinlock_t *irqlock,
 			 enum v4l2_buf_type type,
 			 enum v4l2_field field,
 			 unsigned int msize,
-			 void *priv);
+			 void *priv,
+			 struct videobuf_qtype_ops *int_ops);
 int  videobuf_queue_is_busy(struct videobuf_queue *q);
 void videobuf_queue_cancel(struct videobuf_queue *q);