V4L/DVB (6159): General code cleanup

Removed if 0'd code, removed cx88 references.

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 4 insertions, 12 deletions

diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index d8e376dee68b..804ba7ff9770 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -1498,9 +1498,9 @@ static struct pci_driver cx23885_pci_driver = {
 static int cx23885_init(void)
 {
         printk(KERN_INFO "cx23885 driver version %d.%d.%d loaded\n",
-               (CX88_VERSION_CODE >> 16) & 0xff,
-               (CX88_VERSION_CODE >>  8) & 0xff,
-               CX88_VERSION_CODE & 0xff);
+               (CX23885_VERSION_CODE >> 16) & 0xff,
+               (CX23885_VERSION_CODE >>  8) & 0xff,
+               CX23885_VERSION_CODE & 0xff);
 #ifdef SNAPSHOT
         printk(KERN_INFO "cx23885: snapshot date %04d-%02d-%02d\n",
                SNAPSHOT/10000, (SNAPSHOT/100)%100, SNAPSHOT%100);
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 4e1fc68d4206..b60de21c2387 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -38,7 +38,7 @@
 #include <linux/version.h>
 #include <linux/mutex.h>
 
-#define CX88_VERSION_CODE KERNEL_VERSION(0,0,6)
+#define CX23885_VERSION_CODE KERNEL_VERSION(0,0,1)
 
 #define UNSET (-1U)
 
@@ -69,14 +69,6 @@ enum cx23885_itype {
         CX23885_RADIO,
 };
 
-struct cx23885_fmt {
-        char  *name;
-        u32   fourcc;          /* v4l2 format id */
-        int   depth;
-        int   flags;
-        u32   cxformat;
-};
-
 /* buffer for one video frame */
 struct cx23885_buffer {
         /* common v4l buffer stuff -- must be first */