summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Toth <stoth@hauppauge.com>2007-03-20 14:33:53 -0400
committerSteven Toth <stoth@hauppauge.com>2007-03-20 14:33:53 -0400
commit6a4922d1190a3cd33375f2bc62c9c174358d3577 (patch)
tree76f0b1a7b823db7ce4e4b72491c9b32575b2a60f
parent3212fec651f36aa38046be7c4eef9e04b2a0c1ef (diff)
downloadmediapointer-dvb-s2-6a4922d1190a3cd33375f2bc62c9c174358d3577.tar.gz
mediapointer-dvb-s2-6a4922d1190a3cd33375f2bc62c9c174358d3577.tar.bz2
General code cleanup.
From: Steven Toth <stoth@hauppauge.com> Removed if 0'd code, removed cx88 references. Signed-off-by: Steven Toth <stoth@hauppauge.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
-rw-r--r--linux/drivers/media/video/cx23885/cx23885-core.c11
-rw-r--r--linux/drivers/media/video/cx23885/cx23885-dvb.c8
-rw-r--r--linux/drivers/media/video/cx23885/cx23885.h10
3 files changed, 4 insertions, 25 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-core.c b/linux/drivers/media/video/cx23885/cx23885-core.c
index 6a920b0c1..5ebc0b644 100644
--- a/linux/drivers/media/video/cx23885/cx23885-core.c
+++ b/linux/drivers/media/video/cx23885/cx23885-core.c
@@ -826,11 +826,6 @@ void cx23885_dev_unregister(struct cx23885_dev *dev)
cx23885_i2c_unregister(&dev->i2c_bus[1]);
cx23885_i2c_unregister(&dev->i2c_bus[0]);
-#if 0
- cx88_ir_fini(dev);
- if (0 == core->i2c_rc)
- i2c_bit_del_bus(&dev->i2c_adap);
-#endif
iounmap(dev->lmmio);
}
@@ -1523,9 +1518,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/linux/drivers/media/video/cx23885/cx23885-dvb.c b/linux/drivers/media/video/cx23885/cx23885-dvb.c
index 9c543d5f3..d4c63be01 100644
--- a/linux/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/linux/drivers/media/video/cx23885/cx23885-dvb.c
@@ -155,14 +155,6 @@ static int dvb_register(struct cx23885_tsport *port)
printk("%s: frontend initialization failed\n", dev->name);
return -1;
}
-#if 0
- if (dev->core->pll_desc) {
- dev->dvb.frontend->ops.info.frequency_min = dev->core->pll_desc->min;
- dev->dvb.frontend->ops.info.frequency_max = dev->core->pll_desc->max;
- }
- /* Ensure all frontends negotiate bus access */
- dev->dvb.frontend->ops.ts_bus_ctrl = cx88_dvb_bus_ctrl;
-#endif
/* Put the analog decoder in standby to keep it quiet */
cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL);
diff --git a/linux/drivers/media/video/cx23885/cx23885.h b/linux/drivers/media/video/cx23885/cx23885.h
index 4fcf4f9ff..a3317819b 100644
--- a/linux/drivers/media/video/cx23885/cx23885.h
+++ b/linux/drivers/media/video/cx23885/cx23885.h
@@ -39,7 +39,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)
@@ -70,14 +70,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 */