[media] cx231xx: get rid of a bunch of unused cx231xx_fh fields

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
index 8d496405203651ad73e2b012a00fced10211df99..b0cd699aeda6b643a69e378232b18c1444b29780 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-video.c
+++ b/drivers/media/usb/cx231xx/cx231xx-video.c
@@ -1621,9 +1621,6 @@ static int vidioc_streamoff(struct file *file, void *priv,
        if (rc < 0)
                return rc;
 
-       if ((fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) &&
-           (fh->type != V4L2_BUF_TYPE_VBI_CAPTURE))
-               return -EINVAL;
        if (type != fh->type)
                return -EINVAL;
 
@@ -1869,7 +1866,6 @@ static int cx231xx_v4l2_open(struct file *filp)
                return -ERESTARTSYS;
        }
        fh->dev = dev;
-       fh->radio = radio;
        fh->type = fh_type;
        filp->private_data = fh;
        v4l2_fh_init(&fh->fh, vdev);
@@ -1900,7 +1896,7 @@ static int cx231xx_v4l2_open(struct file *filp)
                dev->video_input = dev->video_input > 2 ? 2 : dev->video_input;
 
        }
-       if (fh->radio) {
+       if (radio) {
                cx231xx_videodbg("video_open: setting radio device\n");
 
                /* cx231xx_start_radio(dev); */

diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h
index 4c83ff54a0ff045f30b28fb6ec8ee435b07cf13e..c17889d64e59ccafe1b1bec4ebc16aeff506431d 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx.h
+++ b/drivers/media/usb/cx231xx/cx231xx.h
@@ -433,25 +433,9 @@ struct cx231xx_fh {
        struct v4l2_fh fh;
        struct cx231xx *dev;
        unsigned int stream_on:1;       /* Locks streams */
-       int radio;
-
-       struct videobuf_queue vb_vidq;
-
        enum v4l2_buf_type type;
 
-
-
-/*following is copyed from cx23885.h*/
-       u32                        resources;
-
-       /* video overlay */
-       struct v4l2_window         win;
-       struct v4l2_clip           *clips;
-       unsigned int               nclips;
-
-       /* video capture */
-       struct cx23417_fmt         *fmt;
-       unsigned int               width, height;
+       struct videobuf_queue vb_vidq;
 
        /* vbi capture */
        struct videobuf_queue      vidq;