OSDN Git Service

[media] cx231xx: drop condition with no effect
authorNicholas Mc Guire <hofrat@osadl.org>
Wed, 4 Feb 2015 13:03:11 +0000 (10:03 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Mon, 2 Mar 2015 17:39:32 +0000 (14:39 -0300)
The if and the else code are identical - so the condition has no effect
on the effective code.
This patch removes the condition and the duplicated code.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/usb/cx231xx/cx231xx-core.c

index 4a3f28c..e42bde0 100644 (file)
@@ -176,16 +176,9 @@ int cx231xx_send_usb_command(struct cx231xx_i2c *i2c_bus,
        saddr_len = req_data->saddr_len;
 
        /* Set wValue */
-       if (saddr_len == 1)     /* need check saddr_len == 0  */
-               ven_req.wValue =
-                   req_data->
-                   dev_addr << 9 | _i2c_period << 4 | saddr_len << 2 |
-                   _i2c_nostop << 1 | I2C_SYNC | _i2c_reserve << 6;
-       else
-               ven_req.wValue =
-                   req_data->
-                   dev_addr << 9 | _i2c_period << 4 | saddr_len << 2 |
-                   _i2c_nostop << 1 | I2C_SYNC | _i2c_reserve << 6;
+       ven_req.wValue = (req_data->dev_addr << 9 | _i2c_period << 4 |
+                         saddr_len << 2 | _i2c_nostop << 1 | I2C_SYNC |
+                         _i2c_reserve << 6);
 
        /* set channel number */
        if (req_data->direction & I2C_M_RD) {