[PATCH v2 04/22] i2c-designware: i2c_dw_read: Use "struct dw_i2c_dev" pointer

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxx>
Acked-by: Baruch Siach <baruch@xxxxxxxxxx>
---
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 139f555..bb7b257 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;
--
1.6.5.2

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux GPIO]     [Linux SPI]     [Linux Hardward Monitoring]     [LM Sensors]     [Linux USB Devel]     [Linux Media]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux