aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorShinya Kuribayashi <shinya.kuribayashi@necel.com>2009-11-06 07:50:22 -0500
committerBen Dooks <ben-linux@fluff.org>2009-12-08 19:19:12 -0500
commit41c4e35037337cfcd297322f3f60770955156683 (patch)
treeef9c59db8e16ea635131c63aa234d4fe68978335 /drivers/i2c
parent52d7e430cff3f076d5ae5587e94f2e9b832b85d2 (diff)
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 <shinya.kuribayashi@necel.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-designware.c5
1 files changed, 0 insertions, 5 deletions
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
419i2c_dw_read(struct dw_i2c_dev *dev) 419i2c_dw_read(struct dw_i2c_dev *dev)
420{ 420{
421 struct i2c_msg *msgs = dev->msgs; 421 struct i2c_msg *msgs = dev->msgs;
422 u32 addr = msgs[dev->msg_read_idx].addr;
423 int rx_valid; 422 int rx_valid;
424 423
425 for (; dev->msg_read_idx < dev->msgs_num; dev->msg_read_idx++) { 424 for (; dev->msg_read_idx < dev->msgs_num; dev->msg_read_idx++) {
@@ -429,10 +428,6 @@ i2c_dw_read(struct dw_i2c_dev *dev)
429 if (!(msgs[dev->msg_read_idx].flags & I2C_M_RD)) 428 if (!(msgs[dev->msg_read_idx].flags & I2C_M_RD))
430 continue; 429 continue;
431 430
432 /* different i2c client, reprogram the i2c adapter */
433 if (msgs[dev->msg_read_idx].addr != addr)
434 return;
435
436 if (!(dev->status & STATUS_READ_IN_PROGRESS)) { 431 if (!(dev->status & STATUS_READ_IN_PROGRESS)) {
437 len = msgs[dev->msg_read_idx].len; 432 len = msgs[dev->msg_read_idx].len;
438 buf = msgs[dev->msg_read_idx].buf; 433 buf = msgs[dev->msg_read_idx].buf;