Commit 8f10c2db authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] v4l2-pci-skeleton: set q->dev instead of allocating a context

Stop using alloc_ctx as that is now no longer needed.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 20be7ab8
...@@ -56,7 +56,6 @@ MODULE_LICENSE("GPL v2"); ...@@ -56,7 +56,6 @@ MODULE_LICENSE("GPL v2");
* @format: current pix format * @format: current pix format
* @input: current video input (0 = SDTV, 1 = HDTV) * @input: current video input (0 = SDTV, 1 = HDTV)
* @queue: vb2 video capture queue * @queue: vb2 video capture queue
* @alloc_ctx: vb2 contiguous DMA context
* @qlock: spinlock controlling access to buf_list and sequence * @qlock: spinlock controlling access to buf_list and sequence
* @buf_list: list of buffers queued for DMA * @buf_list: list of buffers queued for DMA
* @sequence: frame sequence counter * @sequence: frame sequence counter
...@@ -73,7 +72,6 @@ struct skeleton { ...@@ -73,7 +72,6 @@ struct skeleton {
unsigned input; unsigned input;
struct vb2_queue queue; struct vb2_queue queue;
struct vb2_alloc_ctx *alloc_ctx;
spinlock_t qlock; spinlock_t qlock;
struct list_head buf_list; struct list_head buf_list;
...@@ -182,7 +180,6 @@ static int queue_setup(struct vb2_queue *vq, ...@@ -182,7 +180,6 @@ static int queue_setup(struct vb2_queue *vq,
if (vq->num_buffers + *nbuffers < 3) if (vq->num_buffers + *nbuffers < 3)
*nbuffers = 3 - vq->num_buffers; *nbuffers = 3 - vq->num_buffers;
alloc_ctxs[0] = skel->alloc_ctx;
if (*nplanes) if (*nplanes)
return sizes[0] < skel->format.sizeimage ? -EINVAL : 0; return sizes[0] < skel->format.sizeimage ? -EINVAL : 0;
...@@ -820,6 +817,7 @@ static int skeleton_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -820,6 +817,7 @@ static int skeleton_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
q = &skel->queue; q = &skel->queue;
q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_READ; q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_READ;
q->dev = &pdev->dev;
q->drv_priv = skel; q->drv_priv = skel;
q->buf_struct_size = sizeof(struct skel_buffer); q->buf_struct_size = sizeof(struct skel_buffer);
q->ops = &skel_qops; q->ops = &skel_qops;
...@@ -850,12 +848,6 @@ static int skeleton_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -850,12 +848,6 @@ static int skeleton_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (ret) if (ret)
goto free_hdl; goto free_hdl;
skel->alloc_ctx = vb2_dma_contig_init_ctx(&pdev->dev);
if (IS_ERR(skel->alloc_ctx)) {
dev_err(&pdev->dev, "Can't allocate buffer context");
ret = PTR_ERR(skel->alloc_ctx);
goto free_hdl;
}
INIT_LIST_HEAD(&skel->buf_list); INIT_LIST_HEAD(&skel->buf_list);
spin_lock_init(&skel->qlock); spin_lock_init(&skel->qlock);
...@@ -885,13 +877,11 @@ static int skeleton_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -885,13 +877,11 @@ static int skeleton_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1); ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
if (ret) if (ret)
goto free_ctx; goto free_hdl;
dev_info(&pdev->dev, "V4L2 PCI Skeleton Driver loaded\n"); dev_info(&pdev->dev, "V4L2 PCI Skeleton Driver loaded\n");
return 0; return 0;
free_ctx:
vb2_dma_contig_cleanup_ctx(skel->alloc_ctx);
free_hdl: free_hdl:
v4l2_ctrl_handler_free(&skel->ctrl_handler); v4l2_ctrl_handler_free(&skel->ctrl_handler);
v4l2_device_unregister(&skel->v4l2_dev); v4l2_device_unregister(&skel->v4l2_dev);
...@@ -907,7 +897,6 @@ static void skeleton_remove(struct pci_dev *pdev) ...@@ -907,7 +897,6 @@ static void skeleton_remove(struct pci_dev *pdev)
video_unregister_device(&skel->vdev); video_unregister_device(&skel->vdev);
v4l2_ctrl_handler_free(&skel->ctrl_handler); v4l2_ctrl_handler_free(&skel->ctrl_handler);
vb2_dma_contig_cleanup_ctx(skel->alloc_ctx);
v4l2_device_unregister(&skel->v4l2_dev); v4l2_device_unregister(&skel->v4l2_dev);
pci_disable_device(skel->pdev); pci_disable_device(skel->pdev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment