V4L/DVB: az6027: remove redundant condition check
authorMárton Németh <nm127@freemail.hu>
Mon, 1 Mar 2010 07:10:52 +0000 (04:10 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 18 May 2010 03:46:26 +0000 (00:46 -0300)
The condition (msg[i].addr == 0xd0) is checked twice the second one
is not necessary.

This will remove the following compiler warning:
   az6027.c: In function 'az6027_i2c_xfer':
   az6027.c:942: warning: 'index' may be used uninitialized in this function
   az6027.c:943: warning: 'value' may be used uninitialized in this function
   az6027.c:944: warning: 'length' may be used uninitialized in this function
   az6027.c:945: warning: 'req' may be used uninitialized in this function

Signed-off-by: Márton Németh <nm127@freemail.hu>
Cc: Manu Abraham <abraham.manu@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/dvb-usb/az6027.c

index d7290b2..27acbfb 100644 (file)
@@ -976,17 +976,14 @@ static int az6027_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int n
                                i++;
                        } else {
 
-                               if (msg[i].addr == 0xd0) {
-                                       /* demod 16bit addr */
-                                       req = 0xBD;
-                                       index = (((msg[i].buf[0] << 8) & 0xff00) | (msg[i].buf[1] & 0x00ff));
-                                       value = msg[i].addr + (2 << 8);
-                                       length = msg[i].len - 2;
-                                       len = msg[i].len - 2;
-                                       for (j = 0; j < len; j++)
-                                               data[j] = msg[i].buf[j + 2];
-
-                               }
+                               /* demod 16bit addr */
+                               req = 0xBD;
+                               index = (((msg[i].buf[0] << 8) & 0xff00) | (msg[i].buf[1] & 0x00ff));
+                               value = msg[i].addr + (2 << 8);
+                               length = msg[i].len - 2;
+                               len = msg[i].len - 2;
+                               for (j = 0; j < len; j++)
+                                       data[j] = msg[i].buf[j + 2];
                                az6027_usb_out_op(d, req, value, index, data, length);
                        }
                }