i2c-highlander: remover superflous variable
authorWolfram Sang <w.sang@pengutronix.de>
Tue, 2 Feb 2010 12:03:31 +0000 (13:03 +0100)
committerBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 23:19:01 +0000 (00:19 +0100)
When cppcheck found this flaw

[./i2c/busses/i2c-highlander.c:284]: (style) Warning - using char variable in bit operation

it was noted that the 'read'-variable could be simply removed as read_write can
only be 0 or 1 anyhow. So, we remove the flaw and simplify the code.

Reported-by: d binderman <dcb314@hotmail.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Jean Delvare <khali@linux-fr.org>
Cc: Ben Dooks <ben-linux@fluff.org>
drivers/i2c/busses/i2c-highlander.c

index ce87a902c94dbaf1081a28fa7fb7c397e3043307..3df1bc80f37a6dd2edc6530424cea6a122d3564f 100644 (file)
@@ -282,7 +282,6 @@ static int highlander_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr,
                                  union i2c_smbus_data *data)
 {
        struct highlander_i2c_dev *dev = i2c_get_adapdata(adap);
-       int read = read_write & I2C_SMBUS_READ;
        u16 tmp;
 
        init_completion(&dev->cmd_complete);
@@ -337,11 +336,11 @@ static int highlander_i2c_smbus_xfer(struct i2c_adapter *adap, u16 addr,
        highlander_i2c_done(dev);
 
        /* Set slave address */
-       iowrite16((addr << 1) | read, dev->base + SMSMADR);
+       iowrite16((addr << 1) | read_write, dev->base + SMSMADR);
 
        highlander_i2c_command(dev, command, dev->buf_len);
 
-       if (read)
+       if (read_write == I2C_SMBUS_READ)
                return highlander_i2c_read(dev);
        else
                return highlander_i2c_write(dev);