Skip to content

Commit

Permalink
i2c-designware: i2c_dw_read: Use "struct dw_i2c_dev" pointer
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Shinya Kuribayashi authored and Ben Dooks committed Dec 9, 2009
1 parent 91b52ca commit 78839bd
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/i2c/busses/i2c-designware.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 78839bd

Please sign in to comment.