summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx88/cx88-blackbird.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2016-02-15 15:37:15 +0100
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-08 19:37:17 +0200
commit2bc46b3ad3c15165f91459b07ff8682478683194 (patch)
tree01a28e76142c4dde286157e7253fbd89dddc300b /drivers/media/pci/cx88/cx88-blackbird.c
parent[media] sur40: set q->dev instead of allocating a context (diff)
downloadlinux-2bc46b3ad3c15165f91459b07ff8682478683194.tar.xz
linux-2bc46b3ad3c15165f91459b07ff8682478683194.zip
[media] media/pci: convert drivers to use the new vb2_queue dev field
Stop using alloc_ctx and just fill in the device pointer. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Cc: Federico Vaga <federico.vaga@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/pci/cx88/cx88-blackbird.c')
-rw-r--r--drivers/media/pci/cx88/cx88-blackbird.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c
index 3233d45d1e5b..7c026c1ca1fe 100644
--- a/drivers/media/pci/cx88/cx88-blackbird.c
+++ b/drivers/media/pci/cx88/cx88-blackbird.c
@@ -647,7 +647,6 @@ static int queue_setup(struct vb2_queue *q,
dev->ts_packet_size = 188 * 4;
dev->ts_packet_count = 32;
sizes[0] = dev->ts_packet_size * dev->ts_packet_count;
- alloc_ctxs[0] = dev->alloc_ctx;
return 0;
}
@@ -1183,6 +1182,7 @@ static int cx8802_blackbird_probe(struct cx8802_driver *drv)
q->mem_ops = &vb2_dma_sg_memops;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->lock = &core->lock;
+ q->dev = &dev->pci->dev;
err = vb2_queue_init(q);
if (err < 0)