From afb8d48f0d8627349399c8cdf9001b91ac1b49e6 Mon Sep 17 00:00:00 2001 From: Shinya Kuribayashi Date: Fri, 6 Nov 2009 21:45:39 +0900 Subject: [PATCH] --- yaml --- r: 173848 b: refs/heads/master c: 78839bd0f22c3b6e7273568e042bf4d637cfedb3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-designware.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 637f7e6a216b..5c28b53e2a24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91b52caec040064b4df540b72ad7f18a22fd0508 +refs/heads/master: 78839bd0f22c3b6e7273568e042bf4d637cfedb3 diff --git a/trunk/drivers/i2c/busses/i2c-designware.c b/trunk/drivers/i2c/busses/i2c-designware.c index 139f5556b610..bb7b25766ea9 100644 --- a/trunk/drivers/i2c/busses/i2c-designware.c +++ b/trunk/drivers/i2c/busses/i2c-designware.c @@ -328,9 +328,8 @@ i2c_dw_xfer_msg(struct i2c_adapter *adap) } static void -i2c_dw_read(struct i2c_adapter *adap) +i2c_dw_read(struct dw_i2c_dev *dev) { - struct dw_i2c_dev *dev = i2c_get_adapdata(adap); struct i2c_msg *msgs = dev->msgs; int num = dev->msgs_num; u32 addr = msgs[dev->msg_read_idx].addr; @@ -416,7 +415,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) if (likely(!dev->cmd_err)) { /* read rx fifo, and disable the adapter */ do { - i2c_dw_read(adap); + i2c_dw_read(dev); } while (dev->status & STATUS_READ_IN_PROGRESS); writel(0, dev->base + DW_IC_ENABLE); ret = num; @@ -450,7 +449,7 @@ static void dw_i2c_pump_msg(unsigned long data) struct dw_i2c_dev *dev = (struct dw_i2c_dev *) data; u32 intr_mask; - i2c_dw_read(&dev->adapter); + i2c_dw_read(dev); i2c_dw_xfer_msg(&dev->adapter); intr_mask = DW_IC_INTR_STOP_DET | DW_IC_INTR_TX_ABRT;