superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

media: v4l2-pci-skeleton: replace vb2_buffer with vb2_v4l2_buffer 

Commit 2d7007153f ("[media] media: videobuf2: Restructure vb2_buffer")
replaced vb2_buffer with vb2_v4l2_buffer in all v4l2 drivers. The
restructuring skipped the v4l2-pci-skeleton, probably because it resides
outside the drivers directory.

The v4l2_buf_ops assume that the passed buffer is a vb2_v4l2_buffer.
This is not the case if the skel_buffer is based on vb2_buffer instead
of vb2_v4l2_buffer.

Replace vb2_buffer with vb2_v4l2_buffer in the skeleton to make sure
that future drivers that are based on the skeleton use vb2_v4l2_buffer.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
pull/635/head
Michael Tretter 2018-11-26 13:01:24 -05:00 committed by Mauro Carvalho Chehab
parent c2286cc02e
commit b52b88ce5b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
samples/v4l/v4l2-pci-skeleton.c
View File

@ -80,13 +80,13 @@ struct skeleton {
}; };
struct skel_buffer { struct skel_buffer {
struct vb2_buffer vb; struct vb2_v4l2_buffer vb;
struct list_head list; struct list_head list;
}; };
static inline struct skel_buffer *to_skel_buffer(struct vb2_buffer *vb2) static inline struct skel_buffer *to_skel_buffer(struct vb2_v4l2_buffer *vbuf)
{ {
return container_of(vb2, struct skel_buffer, vb); return container_of(vbuf, struct skel_buffer, vb);
} }
static const struct pci_device_id skeleton_pci_tbl[] = { static const struct pci_device_id skeleton_pci_tbl[] = {
@ -212,8 +212,9 @@ static int buffer_prepare(struct vb2_buffer *vb)
*/ */
static void buffer_queue(struct vb2_buffer *vb) static void buffer_queue(struct vb2_buffer *vb)
{ {
struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
struct skeleton *skel = vb2_get_drv_priv(vb->vb2_queue); struct skeleton *skel = vb2_get_drv_priv(vb->vb2_queue);
struct skel_buffer *buf = to_skel_buffer(vb); struct skel_buffer *buf = to_skel_buffer(vbuf);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&skel->qlock, flags); spin_lock_irqsave(&skel->qlock, flags);
@ -232,7 +233,7 @@ static void return_all_buffers(struct skeleton *skel,
spin_lock_irqsave(&skel->qlock, flags); spin_lock_irqsave(&skel->qlock, flags);
list_for_each_entry_safe(buf, node, &skel->buf_list, list) { list_for_each_entry_safe(buf, node, &skel->buf_list, list) {
vb2_buffer_done(&buf->vb, state); vb2_buffer_done(&buf->vb.vb2_buf, state);
list_del(&buf->list); list_del(&buf->list);
} }
spin_unlock_irqrestore(&skel->qlock, flags); spin_unlock_irqrestore(&skel->qlock, flags);