4 files changed, 3 insertions, 19 deletions

diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 6f0a8dbc6b3b..3e1b62a2d50d 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -1043,10 +1043,6 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
         cx_write(port->reg_gpcnt_ctl, 3);
         q->count = 1;
 
-        /* A bug in the current 887 implementation, causes an NMI assert during
-         * starting or stopping interrupts or dma. Avoid the bug for the time being,
-         * enabling the developer to work on the demod/tuner locking work.
-         */
         switch(dev->bridge) {
         case CX23885_BRIDGE_885:
         case CX23885_BRIDGE_887:
diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
index 155ab928cd60..c40c37f2d139 100644
--- a/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/drivers/media/video/cx23885/cx23885-i2c.c
@@ -267,12 +267,10 @@ static int detach_inform(struct i2c_client *client)
 void cx23885_call_i2c_clients(struct cx23885_i2c *bus,
                               unsigned int cmd, void *arg)
 {
-//      struct cx23885_dev *dev = bus->dev;
-
         if (bus->i2c_rc != 0)
                 return;
 
-                i2c_clients_command(&bus->i2c_adap, cmd, arg);
+        i2c_clients_command(&bus->i2c_adap, cmd, arg);
 }
 
 static int cx23885_algo_control(struct i2c_adapter *adap,
diff --git a/drivers/media/video/cx23885/cx23885-reg.h b/drivers/media/video/cx23885/cx23885-reg.h
index 5cb692f20d28..771b22ac2153 100644
--- a/drivers/media/video/cx23885/cx23885-reg.h
+++ b/drivers/media/video/cx23885/cx23885-reg.h
@@ -71,21 +71,14 @@ Channel manager Data Structure entry = 20 DWORD
 #define RISC_WRITECM             0xC0000000
 #define RISC_WRITECR             0xD0000000
 
-//#define RISC_SYNC_ODD          0x80000000
-//#define RISC_SYNC_EVEN                 0x80000200
-//#define RISC_RESYNC_ODD                0x80008000
-//#define RISC_RESYNC_EVEN       0x80008200
 
-// Do we need these?
+/* Do we need these? */
 #define RISC_WRITEC              0x50000000
 #define RISC_READC               0xA0000000
 
-// Is this used?
+/* Is this used? */
 #define RISC_IMM                 0x00000001
 
-//#define RISC_CNT_NONE          0x00000000
-//#define RISC_CNT_RSVR          0x00020000
-//#define RISC_JMP_SRP           0x01
 
 /* Audio and Video Core */
 #define HOST_REG1               0x00000000
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 4312c3fcc1ec..929235440e23 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -47,8 +47,6 @@
 /* Max number of inputs by card */
 #define MAX_CX23885_INPUT 8
 
-//#define SHADOW_MAX 3
-
 #define BUFFER_TIMEOUT     (HZ)  /* 0.5 seconds */
 
 #define CX23885_BOARD_NOAUTO               UNSET
@@ -180,7 +178,6 @@ struct cx23885_dev {
         int                        pci_bus, pci_slot;
         u32                        __iomem *lmmio;
         u8                         __iomem *bmmio;
-        //u32                        shadow[SHADOW_MAX];
         int                        pci_irqmask;
 
         /* I2C adapters: Master 1 & 2 (External) & Master 3 (Internal only) */