From 305a5cf4272a8526a6c6e4256b55ebbee40d87c2 Mon Sep 17 00:00:00 2001 From: Shinya Kuribayashi Date: Fri, 6 Nov 2009 21:46:04 +0900 Subject: [PATCH] --- yaml --- r: 173849 b: refs/heads/master c: e77cf23251e7f55335d986ee0a6d2c0084889dee h: refs/heads/master i: 173847: bc9a45e73156046b9c127edf92a06da2477743c5 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 5c28b53e2a24..31211befe115 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78839bd0f22c3b6e7273568e042bf4d637cfedb3 +refs/heads/master: e77cf23251e7f55335d986ee0a6d2c0084889dee diff --git a/trunk/drivers/i2c/busses/i2c-designware.c b/trunk/drivers/i2c/busses/i2c-designware.c index bb7b25766ea9..443f398a2156 100644 --- a/trunk/drivers/i2c/busses/i2c-designware.c +++ b/trunk/drivers/i2c/busses/i2c-designware.c @@ -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; @@ -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); @@ -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)