Skip to content

Commit

Permalink
i2c-designware: i2c_dw_xfer_msg: 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 78839bd commit e77cf23
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 @@ -254,9 +254,8 @@ static int i2c_dw_wait_bus_not_busy(struct dw_i2c_dev *dev)
* that is longer than the size of the TX FIFO.
*/
static void
i2c_dw_xfer_msg(struct i2c_adapter *adap)
i2c_dw_xfer_msg(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 ic_con, intr_mask;
Expand Down Expand Up @@ -394,7 +393,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
goto done;

/* start the transfers */
i2c_dw_xfer_msg(adap);
i2c_dw_xfer_msg(dev);

/* wait for tx to complete */
ret = wait_for_completion_interruptible_timeout(&dev->cmd_complete, HZ);
Expand Down Expand Up @@ -450,7 +449,7 @@ static void dw_i2c_pump_msg(unsigned long data)
u32 intr_mask;

i2c_dw_read(dev);
i2c_dw_xfer_msg(&dev->adapter);
i2c_dw_xfer_msg(dev);

intr_mask = DW_IC_INTR_STOP_DET | DW_IC_INTR_TX_ABRT;
if (dev->status & STATUS_WRITE_IN_PROGRESS)
Expand Down

0 comments on commit e77cf23

Please sign in to comment.