diff options
| author | Shinya Kuribayashi <shinya.kuribayashi@necel.com> | 2009-11-06 21:45:39 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-12-09 00:19:10 +0000 |
| commit | 78839bd0f22c3b6e7273568e042bf4d637cfedb3 (patch) | |
| tree | 496b7e33c1b6926ea84dcd2b0d15e6df269fbbaa /drivers/i2c | |
| parent | 91b52caec040064b4df540b72ad7f18a22fd0508 (diff) | |
i2c-designware: i2c_dw_read: Use "struct dw_i2c_dev" pointer
We don't have to use "struct i2c_adapter" pointer here.
Let's use a local "struct dw_i2c_dev" pointer, instead.
Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Acked-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-designware.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-designware.c index 139f5556b61..bb7b25766ea 100644 --- a/drivers/i2c/busses/i2c-designware.c +++ b/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; |