From: Shinya Kuribayashi Date: Fri, 6 Nov 2009 12:49:14 +0000 (+0900) Subject: i2c-designware: i2c_dw_xfer_msg: Introduce a local "buf" pointer X-Git-Tag: v2.6.33-rc1~339^2~12 X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=26ea15b1f584de02bc85e9c3968d523386332f65 i2c-designware: i2c_dw_xfer_msg: Introduce a local "buf" pointer While we have a local variable "buf_len" for dev->tx_buf_len, we don't have such local variable for dev->tx_buf pointer. While "buf_len" is restored at first then updated when we start processing a new i2c_msg (determined by STATUS_WRITE_IN_PROGRESS flag), ->tx_buf is different. Such inconsistency makes the code slightly hard to follow. Signed-off-by: Shinya Kuribayashi Acked-by: Baruch Siach Signed-off-by: Ben Dooks --- diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-designware.c index da5612b..e8e2212 100644 --- a/drivers/i2c/busses/i2c-designware.c +++ b/drivers/i2c/busses/i2c-designware.c @@ -364,6 +364,7 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev) int rx_limit = dev->rx_fifo_depth - readl(dev->base + DW_IC_RXFLR); u32 addr = msgs[dev->msg_write_idx].addr; u32 buf_len = dev->tx_buf_len; + u8 *buf = dev->tx_buf;; intr_mask = DW_IC_INTR_STOP_DET | DW_IC_INTR_TX_ABRT | DW_IC_INTR_RX_FULL; @@ -384,7 +385,7 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev) if (!(dev->status & STATUS_WRITE_IN_PROGRESS)) { /* new i2c_msg */ - dev->tx_buf = msgs[dev->msg_write_idx].buf; + buf = msgs[dev->msg_write_idx].buf; buf_len = msgs[dev->msg_write_idx].len; } @@ -393,11 +394,11 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev) writel(0x100, dev->base + DW_IC_DATA_CMD); rx_limit--; } else - writel(*(dev->tx_buf++), - dev->base + DW_IC_DATA_CMD); + writel(*buf++, dev->base + DW_IC_DATA_CMD); tx_limit--; buf_len--; } + dev->tx_buf = buf; dev->tx_buf_len = buf_len; if (buf_len > 0) {