V4L/DVB (3708a): Clean up some cruft in or51132 frontend

There is some old code in the or51133 firmware loading function that
has no effect.  Left a comment to in case it helps someone trying
to reverse engineer the chip.

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c
index 80e0f28127b7..dca1de555a58 100644
--- a/drivers/media/dvb/frontends/or51132.c
+++ b/drivers/media/dvb/frontends/or51132.c
@@ -106,9 +106,8 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware
 {
         struct or51132_state* state = fe->demodulator_priv;
         static u8 run_buf[] = {0x7F,0x01};
-        static u8 get_ver_buf[] = {0x04,0x00,0x30,0x00,0x00};
-        u8 rec_buf[14];
-        u8 cmd_buf[14];
+        u8 rec_buf[8];
+        u8 cmd_buf[3];
         u32 firmwareAsize, firmwareBsize;
         int i,ret;
 
@@ -157,7 +156,6 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware
         cmd_buf[0] = 0x10;
         cmd_buf[1] = 0x10;
         cmd_buf[2] = 0x00;
-        cmd_buf[3] = 0x00;
         msleep(20); /* 20ms */
         if ((ret = i2c_writebytes(state,state->config->demod_address,
                                  cmd_buf,3))) {
@@ -167,8 +165,6 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware
 
         cmd_buf[0] = 0x04;
         cmd_buf[1] = 0x17;
-        cmd_buf[2] = 0x00;
-        cmd_buf[3] = 0x00;
         msleep(20); /* 20ms */
         if ((ret = i2c_writebytes(state,state->config->demod_address,
                                  cmd_buf,2))) {
@@ -178,8 +174,6 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware
 
         cmd_buf[0] = 0x00;
         cmd_buf[1] = 0x00;
-        cmd_buf[2] = 0x00;
-        cmd_buf[3] = 0x00;
         msleep(20); /* 20ms */
         if ((ret = i2c_writebytes(state,state->config->demod_address,
                                  cmd_buf,2))) {
@@ -189,7 +183,11 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware
 
         for(i=0;i<4;i++) {
                 msleep(20); /* 20ms */
-                get_ver_buf[4] = i+1;
+                /* One apon a time, this command might have had something
+                   to do with getting the firmware version, but it's
+                   not used anymore:
+                   {0x04,0x00,0x30,0x00,i+1} */
+                /* Read 8 bytes, two bytes at a time */
                 if ((ret = i2c_readbytes(state,state->config->demod_address,
                                         &rec_buf[i*2],2))) {
                         printk(KERN_WARNING
@@ -208,7 +206,6 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware
         cmd_buf[0] = 0x10;
         cmd_buf[1] = 0x00;
         cmd_buf[2] = 0x00;
-        cmd_buf[3] = 0x00;
         msleep(20); /* 20ms */
         if ((ret = i2c_writebytes(state,state->config->demod_address,
                                  cmd_buf,3))) {