redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[media] cx25821: remove 'type' field from cx25821_fh 

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
hifive-unleashed-5.1
Hans Verkuil 2013-04-14 11:54:56 -03:00 committed by Mauro Carvalho Chehab
parent be178cb4f4
commit 11f095aa41
2 changed files with 15 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/media/pci/cx25821/cx25821-video.c
View File

@ -506,24 +506,12 @@ static void cx25821_buffer_release(struct videobuf_queue *q,
static struct videobuf_queue *get_queue(struct cx25821_fh *fh) static struct videobuf_queue *get_queue(struct cx25821_fh *fh)
{ {
switch (fh->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
return &fh->vidq; return &fh->vidq;
default:
BUG();
return NULL;
}
} }
static int cx25821_get_resource(struct cx25821_fh *fh, int resource) static int cx25821_get_resource(struct cx25821_fh *fh, int resource)
{ {
switch (fh->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
return resource; return resource;
default:
BUG();
return 0;
}
} }
static int cx25821_video_mmap(struct file *file, struct vm_area_struct *vma) static int cx25821_video_mmap(struct file *file, struct vm_area_struct *vma)
@ -605,7 +593,6 @@ static int video_open(struct file *file)
struct video_device *vdev = video_devdata(file); struct video_device *vdev = video_devdata(file);
struct cx25821_dev *dev = video_drvdata(file); struct cx25821_dev *dev = video_drvdata(file);
struct cx25821_fh *fh; struct cx25821_fh *fh;
enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
u32 pix_format; u32 pix_format;
int ch_id; int ch_id;
@ -624,7 +611,6 @@ static int video_open(struct file *file)
file->private_data = fh; file->private_data = fh;
fh->dev = dev; fh->dev = dev;
fh->type = type;
fh->width = 720; fh->width = 720;
fh->channel_id = ch_id; fh->channel_id = ch_id;
@ -659,8 +645,6 @@ static ssize_t video_read(struct file *file, char __user * data, size_t count,
struct cx25821_dev *dev = fh->dev; struct cx25821_dev *dev = fh->dev;
int err; int err;
switch (fh->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
if (mutex_lock_interruptible(&dev->lock)) if (mutex_lock_interruptible(&dev->lock))
return -ERESTARTSYS; return -ERESTARTSYS;
if (cx25821_res_locked(fh, RESOURCE_VIDEO0)) if (cx25821_res_locked(fh, RESOURCE_VIDEO0))
@ -670,11 +654,6 @@ static ssize_t video_read(struct file *file, char __user * data, size_t count,
file->f_flags & O_NONBLOCK); file->f_flags & O_NONBLOCK);
mutex_unlock(&dev->lock); mutex_unlock(&dev->lock);
return err; return err;
default:
return -ENODEV;
}
} }
static unsigned int video_poll(struct file *file, static unsigned int video_poll(struct file *file,
@ -818,14 +797,11 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
struct cx25821_fh *fh = priv; struct cx25821_fh *fh = priv;
struct cx25821_dev *dev = fh->dev; struct cx25821_dev *dev = fh->dev;
if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)) if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL; return -EINVAL;
if (unlikely(i != fh->type)) if (!cx25821_res_get(dev, fh,
return -EINVAL; cx25821_get_resource(fh, RESOURCE_VIDEO0)))
if (unlikely(!cx25821_res_get(dev, fh, cx25821_get_resource(fh,
RESOURCE_VIDEO0))))
return -EBUSY; return -EBUSY;
return videobuf_streamon(get_queue(fh)); return videobuf_streamon(get_queue(fh));
@ -837,9 +813,7 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
struct cx25821_dev *dev = fh->dev; struct cx25821_dev *dev = fh->dev;
int err, res; int err, res;
if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)
return -EINVAL;
if (i != fh->type)
return -EINVAL; return -EINVAL;
res = cx25821_get_resource(fh, RESOURCE_VIDEO0); res = cx25821_get_resource(fh, RESOURCE_VIDEO0);

1
drivers/media/pci/cx25821/cx25821.h
View File

@ -118,7 +118,6 @@ struct cx25821_tvnorm {
struct cx25821_fh { struct cx25821_fh {
struct cx25821_dev *dev; struct cx25821_dev *dev;
enum v4l2_buf_type type;
u32 resources; u32 resources;
enum v4l2_priority prio; enum v4l2_priority prio;