openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] em28xx: move videobuf2 related data from struct em28xx to struct v4l2 

The video and VBI-specific VB2 queue and mutexes are used only by
the v4l2 sub-driver. Move them to the V4L2 struct, preventing
wasting memory if this sub-driver is not used.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Frank Schaefer 2014-03-24 16:33:13 -03:00 committed by Mauro Carvalho Chehab
parent ef74a0b9ff
commit 27a36df63b
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/usb/em28xx/em28xx-cards.c
View File

@ -3016,8 +3016,6 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
const char *chip_name = default_chip_name;
dev->udev = udev;
mutex_init(&dev->vb_queue_lock);
mutex_init(&dev->vb_vbi_queue_lock);
mutex_init(&dev->ctrl_urb_lock);
spin_lock_init(&dev->slock);

15
drivers/media/usb/em28xx/em28xx-video.c
View File

@ -1045,9 +1045,10 @@ static int em28xx_vb2_setup(struct em28xx *dev)
{
int rc;
struct vb2_queue *q;
struct em28xx_v4l2 *v4l2 = dev->v4l2;
/* Setup Videobuf2 for Video capture */
q = &dev->vb_vidq;
q = &v4l2->vb_vidq;
q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
@ -1061,7 +1062,7 @@ static int em28xx_vb2_setup(struct em28xx *dev)
return rc;
/* Setup Videobuf2 for VBI capture */
q = &dev->vb_vbiq;
q = &v4l2->vb_vbiq;
q->type = V4L2_BUF_TYPE_VBI_CAPTURE;
q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
@ -2479,8 +2480,10 @@ static int em28xx_v4l2_init(struct em28xx *dev)
ret = -ENODEV;
goto unregister_dev;
}
v4l2->vdev->queue = &dev->vb_vidq;
v4l2->vdev->queue->lock = &dev->vb_queue_lock;
mutex_init(&v4l2->vb_queue_lock);
mutex_init(&v4l2->vb_vbi_queue_lock);
v4l2->vdev->queue = &v4l2->vb_vidq;
v4l2->vdev->queue->lock = &v4l2->vb_queue_lock;
/* disable inapplicable ioctls */
if (dev->board.is_webcam) {
@ -2515,8 +2518,8 @@ static int em28xx_v4l2_init(struct em28xx *dev)
v4l2->vbi_dev = em28xx_vdev_init(dev, &em28xx_video_template,
"vbi");
v4l2->vbi_dev->queue = &dev->vb_vbiq;
v4l2->vbi_dev->queue->lock = &dev->vb_vbi_queue_lock;
v4l2->vbi_dev->queue = &v4l2->vb_vbiq;
v4l2->vbi_dev->queue->lock = &v4l2->vb_vbi_queue_lock;
/* disable inapplicable ioctls */
v4l2_disable_ioctl(v4l2->vdev, VIDIOC_S_PARM);

12
drivers/media/usb/em28xx/em28xx.h
View File

@ -509,6 +509,12 @@ struct em28xx_v4l2 {
struct video_device *vdev;
struct video_device *vbi_dev;
struct video_device *radio_dev;
/* Videobuf2 */
struct vb2_queue vb_vidq;
struct vb2_queue vb_vbiq;
struct mutex vb_queue_lock;
struct mutex vb_vbi_queue_lock;
};
struct em28xx_audio {
@ -650,12 +656,6 @@ struct em28xx {
struct mutex lock;
struct mutex ctrl_urb_lock; /* protects urb_buf */
/* Videobuf2 */
struct vb2_queue vb_vidq;
struct vb2_queue vb_vbiq;
struct mutex vb_queue_lock;
struct mutex vb_vbi_queue_lock;
/* resources in use */
unsigned int resources;