4 files changed, 4 insertions, 52 deletions

diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index b4ee9dfe6d42..6239254db27e 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -567,10 +567,6 @@ static void msp3400c_set_audmode(struct i2c_client *client, int audmode)
         switch (audmode) {
         case V4L2_TUNER_MODE_STEREO:
                 src = 0x0020 | nicam;
-#if 0
-                /* spatial effect */
-                msp3400c_write(client,I2C_MSP3400C_DFP, 0x0005,0x4000);
-#endif
                 break;
         case V4L2_TUNER_MODE_MONO:
                 if (msp->mode == MSP_MODE_AM_NICAM) {
@@ -741,16 +737,14 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout)
                         set_current_state(TASK_INTERRUPTIBLE);
                         schedule();
                 } else {
-#if 0
-                        /* hmm, that one doesn't return on wakeup ... */
-                        msleep_interruptible(timeout);
-#else
                         set_current_state(TASK_INTERRUPTIBLE);
                         schedule_timeout(msecs_to_jiffies(timeout));
-#endif
                 }
         }
-        try_to_freeze();
+        if (current->flags & PF_FREEZE) {
+                refrigerator ();
+        }
+
         remove_wait_queue(&msp->wq, &wait);
         return msp->restart;
 }
@@ -1154,17 +1148,10 @@ static int msp3410d_thread(void *data)
                                             MSP_CARRIER(10.7));
                         /* scart routing */
                         msp3400c_set_scart(client,SCART_IN2,0);
-#if 0
-                        /* radio from SCART_IN2 */
-                        msp3400c_write(client,I2C_MSP3400C_DFP, 0x08, 0x0220);
-                        msp3400c_write(client,I2C_MSP3400C_DFP, 0x09, 0x0220);
-                        msp3400c_write(client,I2C_MSP3400C_DFP, 0x0b, 0x0220);
-#else
                         /* msp34xx does radio decoding */
                         msp3400c_write(client,I2C_MSP3400C_DFP, 0x08, 0x0020);
                         msp3400c_write(client,I2C_MSP3400C_DFP, 0x09, 0x0020);
                         msp3400c_write(client,I2C_MSP3400C_DFP, 0x0b, 0x0020);
-#endif
                         break;
                 case 0x0003:
                 case 0x0004:
@@ -1507,10 +1494,6 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
                 return -1;
         }
 
-#if 0
-        /* this will turn on a 1kHz beep - might be useful for debugging... */
-        msp3400c_write(c,I2C_MSP3400C_DFP, 0x0014, 0x1040);
-#endif
         msp3400c_setvolume(c, msp->muted, msp->volume, msp->balance);
 
         snprintf(c->name, sizeof(c->name), "MSP34%02d%c-%c%d",
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 07ba6d3ed08c..7cb1fb3e66f9 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -243,19 +243,6 @@ static int tda7432_write(struct i2c_client *client, int subaddr, int val)
 }
 
 /* I don't think we ever actually _read_ the chip... */
-#if 0
-static int tda7432_read(struct i2c_client *client)
-{
-        unsigned char buffer;
-        d2printk("tda7432: In tda7432_read\n");
-        if (1 != i2c_master_recv(client,&buffer,1)) {
-                printk(KERN_WARNING "tda7432: I/O error, trying (read)\n");
-                return -1;
-        }
-        dprintk("tda7432: Read 0x%02x\n", buffer);
-        return buffer;
-}
-#endif
 
 static int tda7432_set(struct i2c_client *client)
 {
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 97b113e070f3..566e1a5ca135 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -123,19 +123,6 @@ static int tda9875_write(struct i2c_client *client, int subaddr, unsigned char v
         return 0;
 }
 
-#if 0
-static int tda9875_read(struct i2c_client *client)
-{
-        unsigned char buffer;
-        dprintk("In tda9875_read\n");
-        if (1 != i2c_master_recv(client,&buffer,1)) {
-                printk(KERN_WARNING "tda9875: I/O error, trying (read)\n");
-                return -1;
-        }
-        dprintk("Read 0x%02x\n", buffer);
-        return buffer;
-}
-#endif
 
 static int i2c_read_register(struct i2c_adapter *adap, int addr, int reg)
 {
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 9a493bea76d8..d8b78f1d686b 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -864,13 +864,8 @@ static int tda9874a_getmode(struct CHIPSTATE *chip)
                  * But changing the mode to VIDEO_SOUND_MONO would switch
                  * external 4052 multiplexer in audio_hook().
                  */
-#if 0
-                if((nsr & 0x02) && !(dsr & 0x10)) /* NSR.S/MB=1 and DSR.AMSTAT=0 */
-                        mode |= VIDEO_SOUND_STEREO;
-#else
                 if(nsr & 0x02) /* NSR.S/MB=1 */
                         mode |= VIDEO_SOUND_STEREO;
-#endif
                 if(nsr & 0x01) /* NSR.D/SB=1 */
                         mode |= VIDEO_SOUND_LANG1 | VIDEO_SOUND_LANG2;
         } else {