From: Shinya Kuribayashi Date: Fri, 6 Nov 2009 12:50:22 +0000 (+0900) Subject: i2c-designware: i2c_dw_read: Remove redundant target address checker X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=41c4e35037337cfcd297322f3f60770955156683;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git i2c-designware: i2c_dw_read: Remove redundant target address checker I2c_dw_xfer_msg() also has the same target address inconsistency check, and furthermore it checks across all i2c_msg messages, while i2c_dw_read() walks through i2c_msg messages only with_ I2C_M_RD flag. That is, target address check in i2c_dw_read() is redundant and useless. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ben Dooks --- diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-designware.c index 5ba7e55eb7f4..5a3bd74c81d5 100644 --- a/drivers/i2c/busses/i2c-designware.c +++ b/drivers/i2c/busses/i2c-designware.c @@ -419,7 +419,6 @@ static void i2c_dw_read(struct dw_i2c_dev *dev) { struct i2c_msg *msgs = dev->msgs; - u32 addr = msgs[dev->msg_read_idx].addr; int rx_valid; for (; dev->msg_read_idx < dev->msgs_num; dev->msg_read_idx++) { @@ -429,10 +428,6 @@ i2c_dw_read(struct dw_i2c_dev *dev) if (!(msgs[dev->msg_read_idx].flags & I2C_M_RD)) continue; - /* different i2c client, reprogram the i2c adapter */ - if (msgs[dev->msg_read_idx].addr != addr) - return; - if (!(dev->status & STATUS_READ_IN_PROGRESS)) { len = msgs[dev->msg_read_idx].len; buf = msgs[dev->msg_read_idx].buf;