diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-04-17 08:56:42 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-13 16:28:35 (GMT) |
| commit | 6296cba83bc6427dcf7e24b4745aaae9f2eb5967 (patch) | |
| tree | 7a805145b1b0c1b8946217fefdde5823f6942760 /drivers/media/pci/saa7134/saa7134-empress.c | |
| parent | 9e534f8478477bb9f5a12ced9e24f979c64976e5 (diff) | |
| download | linux-6296cba83bc6427dcf7e24b4745aaae9f2eb5967.tar.xz | |
[media] saa7134: rename empress_tsq to empress_vbq
Create consistent _vbq suffix for videobuf_queue fields.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci/saa7134/saa7134-empress.c')
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134-empress.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-empress.c b/drivers/media/pci/saa7134/saa7134-empress.c index 393c9f1..7d4d390 100644 --- a/drivers/media/pci/saa7134/saa7134-empress.c +++ b/drivers/media/pci/saa7134/saa7134-empress.c @@ -112,8 +112,8 @@ static int ts_release(struct file *file) struct saa7134_fh *fh = file->private_data; if (res_check(fh, RESOURCE_EMPRESS)) { - videobuf_stop(&dev->empress_tsq); - videobuf_mmap_free(&dev->empress_tsq); + videobuf_stop(&dev->empress_vbq); + videobuf_mmap_free(&dev->empress_vbq); /* stop the encoder */ ts_reset_encoder(dev); @@ -138,7 +138,7 @@ ts_read(struct file *file, char __user *data, size_t count, loff_t *ppos) if (!dev->empress_started) ts_init_encoder(dev); - return videobuf_read_stream(&dev->empress_tsq, + return videobuf_read_stream(&dev->empress_vbq, data, count, ppos, 0, file->f_flags & O_NONBLOCK); } @@ -155,7 +155,7 @@ ts_poll(struct file *file, struct poll_table_struct *wait) rc = POLLPRI; else if (req_events & POLLPRI) poll_wait(file, &fh->fh.wait, wait); - return rc | videobuf_poll_stream(file, &dev->empress_tsq, wait); + return rc | videobuf_poll_stream(file, &dev->empress_vbq, wait); } @@ -164,7 +164,7 @@ ts_mmap(struct file *file, struct vm_area_struct * vma) { struct saa7134_dev *dev = video_drvdata(file); - return videobuf_mmap_mapper(&dev->empress_tsq, vma); + return videobuf_mmap_mapper(&dev->empress_vbq, vma); } static int empress_enum_fmt_vid_cap(struct file *file, void *priv, @@ -354,7 +354,7 @@ static int empress_init(struct saa7134_dev *dev) printk(KERN_INFO "%s: registered device %s [mpeg]\n", dev->name, video_device_node_name(dev->empress_dev)); - videobuf_queue_sg_init(&dev->empress_tsq, &saa7134_ts_qops, + videobuf_queue_sg_init(&dev->empress_vbq, &saa7134_ts_qops, &dev->pci->dev, &dev->slock, V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_ALTERNATE, |