[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>

diff --git a/drivers/media/pci/cx25821/cx25821-video.c b/drivers/media/pci/cx25821/cx25821-video.c
index ab79bd5e5f6833c8bd1df1511c999452fd619e6a..2aba24f2a3d82a15a7c32daa32ec558f52fdedc9 100644 (file)
--- a/drivers/media/pci/cx25821/cx25821-video.c
+++ b/drivers/media/pci/cx25821/cx25821-video.c
@@ -506,24 +506,12 @@ static void cx25821_buffer_release(struct videobuf_queue *q,
 
 static struct videobuf_queue *get_queue(struct cx25821_fh *fh)
 {
-       switch (fh->type) {
-       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-               return &fh->vidq;
-       default:
-               BUG();
-               return NULL;
-       }
+       return &fh->vidq;
 }
 
 static int cx25821_get_resource(struct cx25821_fh *fh, int resource)
 {
-       switch (fh->type) {
-       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-               return resource;
-       default:
-               BUG();
-               return 0;
-       }
+       return resource;
 }
 
 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 cx25821_dev *dev = video_drvdata(file);
        struct cx25821_fh *fh;
-       enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
        u32 pix_format;
        int ch_id;
 
@@ -624,7 +611,6 @@ static int video_open(struct file *file)
 
        file->private_data = fh;
        fh->dev = dev;
-       fh->type = type;
        fh->width = 720;
        fh->channel_id = ch_id;
 
@@ -659,22 +645,15 @@ static ssize_t video_read(struct file *file, char __user * data, size_t count,
        struct cx25821_dev *dev = fh->dev;
        int err;
 
-       switch (fh->type) {
-       case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-               if (mutex_lock_interruptible(&dev->lock))
-                       return -ERESTARTSYS;
-               if (cx25821_res_locked(fh, RESOURCE_VIDEO0))
-                       err = -EBUSY;
-               else
-                       err = videobuf_read_one(&fh->vidq, data, count, ppos,
-                                       file->f_flags & O_NONBLOCK);
-               mutex_unlock(&dev->lock);
-               return err;
-
-       default:
-               return -ENODEV;
-       }
-
+       if (mutex_lock_interruptible(&dev->lock))
+               return -ERESTARTSYS;
+       if (cx25821_res_locked(fh, RESOURCE_VIDEO0))
+               err = -EBUSY;
+       else
+               err = videobuf_read_one(&fh->vidq, data, count, ppos,
+                               file->f_flags & O_NONBLOCK);
+       mutex_unlock(&dev->lock);
+       return err;
 }
 
 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_dev *dev = fh->dev;
 
-       if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE))
-               return -EINVAL;
-
-       if (unlikely(i != fh->type))
+       if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                return -EINVAL;
 
-       if (unlikely(!cx25821_res_get(dev, fh, cx25821_get_resource(fh,
-                                               RESOURCE_VIDEO0))))
+       if (!cx25821_res_get(dev, fh,
+                       cx25821_get_resource(fh, RESOURCE_VIDEO0)))
                return -EBUSY;
 
        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;
        int err, res;
 
-       if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-               return -EINVAL;
-       if (i != fh->type)
+       if (i != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                return -EINVAL;
 
        res = cx25821_get_resource(fh, RESOURCE_VIDEO0);

diff --git a/drivers/media/pci/cx25821/cx25821.h b/drivers/media/pci/cx25821/cx25821.h
index ad56232154e63fa3489ea380d1f0902b7a986df9..d1c91c9e911a466be2bfd4fa8fce5092c4511784 100644 (file)
--- a/drivers/media/pci/cx25821/cx25821.h
+++ b/drivers/media/pci/cx25821/cx25821.h
@@ -118,7 +118,6 @@ struct cx25821_tvnorm {
 
 struct cx25821_fh {
        struct cx25821_dev *dev;
-       enum v4l2_buf_type type;
        u32 resources;
 
        enum v4l2_priority prio;