adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

i2c-designware: i2c_dw_xfer_msg: Use "struct dw_i2c_dev" pointer

Browse source 
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>
This commit is contained in:
Shinya Kuribayashi 2009-11-06 21:46:04 +09:00 committed by Ben Dooks
parent 78839bd0f2
commit e77cf23251
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/i2c/busses/i2c-designware.c
View file

@ -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. * that is longer than the size of the TX FIFO.
*/ */
static void 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; struct i2c_msg *msgs = dev->msgs;
int num = dev->msgs_num; int num = dev->msgs_num;
u32 ic_con, intr_mask; u32 ic_con, intr_mask;
@ -394,7 +393,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
goto done; goto done;
/* start the transfers */ /* start the transfers */
i2c_dw_xfer_msg(adap); i2c_dw_xfer_msg(dev);
/* wait for tx to complete */ /* wait for tx to complete */
ret = wait_for_completion_interruptible_timeout(&dev->cmd_complete, HZ); ret = wait_for_completion_interruptible_timeout(&dev->cmd_complete, HZ);
@ -450,7 +449,7 @@ static void dw_i2c_pump_msg(unsigned long data)
u32 intr_mask; u32 intr_mask;
i2c_dw_read(dev); 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; intr_mask = DW_IC_INTR_STOP_DET | DW_IC_INTR_TX_ABRT;
if (dev->status & STATUS_WRITE_IN_PROGRESS) if (dev->status & STATUS_WRITE_IN_PROGRESS)