[media] cx88: move fmt, width and height to cx8800_dev

These are global properties and do not belong in the filehandle struct.

Note: the overlay related fields were just removed: they weren't used at all.

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

1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 1426993079b0..94af48e91b52 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -457,14 +457,7 @@ struct cx8800_fh {
         struct cx8800_dev          *dev;
         unsigned int               resources;
 
-        /* video overlay */
-        struct v4l2_window         win;
-        struct v4l2_clip           *clips;
-        unsigned int               nclips;
-
         /* video capture */
-        const struct cx8800_fmt    *fmt;
-        unsigned int               width,height;
         struct videobuf_queue      vidq;
 
         /* vbi capture */
@@ -489,6 +482,8 @@ struct cx8800_dev {
         struct pci_dev             *pci;
         unsigned char              pci_rev,pci_lat;
 
+        const struct cx8800_fmt    *fmt;
+        unsigned int               width, height;
 
         /* capture queues */
         struct cx88_dmaqueue       vidq;