i2c-highlander: remover superflous variable

[net-next-2.6.git] / drivers / i2c / busses / i2c-highlander.c

diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c
index 87ecace415da39ac49449c25acdd3e377c3f5a8b..3df1bc80f37a6dd2edc6530424cea6a122d3564f 100644 (file)
--- a/drivers/i2c/busses/i2c-highlander.c
+++ b/drivers/i2c/busses/i2c-highlander.c
@@ -19,6 +19,7 @@
 #include <linux/completion.h>
 #include <linux/io.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #define SMCR           0x00
 #define SMCR_START     (1 << 0)
@@ -281,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);
@@ -336,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);