diff options
author | Doug Anderson <dianders@chromium.org> | 2014-06-23 17:20:06 -0400 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2014-09-30 02:06:02 -0400 |
commit | d8e0a86f9713689e35dc14f7184e85a13a2a9f4e (patch) | |
tree | 0637d492c9a436385f3e4cca3ef9dde9e7fed048 /drivers/i2c/busses/i2c-cros-ec-tunnel.c | |
parent | 6c97c9c1acfce89cce2f239f0325786f95aea848 (diff) |
i2c: cros_ec: Remove EC_I2C_FLAG_10BIT
In <https://lkml.org/lkml/2014/6/10/265> pointed out that the 10-bit
flag in the cros_ec_tunnel was useless. It went into a 16-bit flags
field but was defined at (1 << 16).
Since we have no 10-bit i2c devices on the other side of the tunnel on
any known devices this was never a problem. Until we do it makes
sense to remove this code. On the EC side the code to handle this
flag was removed in <https://chromium-review.googlesource.com/204162>.
Reported-by: Dave Jones <davej@redhat.com>
Signed-off-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-cros-ec-tunnel.c')
-rw-r--r-- | drivers/i2c/busses/i2c-cros-ec-tunnel.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-cros-ec-tunnel.c b/drivers/i2c/busses/i2c-cros-ec-tunnel.c index 0403ec1dc3b5..fc89c13b1632 100644 --- a/drivers/i2c/busses/i2c-cros-ec-tunnel.c +++ b/drivers/i2c/busses/i2c-cros-ec-tunnel.c | |||
@@ -94,7 +94,7 @@ static int ec_i2c_construct_message(u8 *buf, const struct i2c_msg i2c_msgs[], | |||
94 | msg->addr_flags = i2c_msg->addr; | 94 | msg->addr_flags = i2c_msg->addr; |
95 | 95 | ||
96 | if (i2c_msg->flags & I2C_M_TEN) | 96 | if (i2c_msg->flags & I2C_M_TEN) |
97 | msg->addr_flags |= EC_I2C_FLAG_10BIT; | 97 | return -EINVAL; |
98 | 98 | ||
99 | if (i2c_msg->flags & I2C_M_RD) { | 99 | if (i2c_msg->flags & I2C_M_RD) { |
100 | msg->addr_flags |= EC_I2C_FLAG_READ; | 100 | msg->addr_flags |= EC_I2C_FLAG_READ; |
@@ -218,7 +218,9 @@ static int ec_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg i2c_msgs[], | |||
218 | } | 218 | } |
219 | } | 219 | } |
220 | 220 | ||
221 | ec_i2c_construct_message(request, i2c_msgs, num, bus_num); | 221 | result = ec_i2c_construct_message(request, i2c_msgs, num, bus_num); |
222 | if (result) | ||
223 | goto exit; | ||
222 | 224 | ||
223 | msg.version = 0; | 225 | msg.version = 0; |
224 | msg.command = EC_CMD_I2C_PASSTHRU; | 226 | msg.command = EC_CMD_I2C_PASSTHRU; |