[PATCH] v4l: I2C Miscelaneous

- Removed unused structures.
- CodingStyle rules applied to comments.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 4 insertions, 21 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",