Received: from milmhbs1.lsil.com (147.145.21.209) by coscas01.lsi.com
 (172.21.36.60) with Microsoft SMTP Server id 8.1.393.1; Mon, 12 Oct 2009
 20:54:27 -0600
Received: from mail2.lsil.com (mail2.lsil.com [147.145.40.22])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id n9D2sR3a025885	for
 <andy.sharp@lsi.com>; Mon, 12 Oct 2009 19:54:27 -0700
Received: from psmtp.com (na3sys009amx243.postini.com [74.125.149.127])	by
 mail2.lsil.com (8.12.11/8.12.11) with SMTP id n9D2omle009637	for
 <andy.sharp@lsi.com>; Mon, 12 Oct 2009 19:50:48 -0700 (PDT)
Received: from source ([78.24.191.182]) by na3sys009amx243.postini.com
 ([74.125.148.14]) with SMTP;	Tue, 13 Oct 2009 02:54:26 GMT
Received: from localhost.localdomain ([127.0.0.1]:45613 "EHLO
	eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org	with
 ESMTP id S1492065AbZJMCyY (ORCPT <rfc822;andy.sharp@lsi.com>);	Tue, 13 Oct
 2009 04:54:24 +0200
Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 13 Oct 2009 04:54:06
 +0200 (CEST)
Received: from TYO201.gate.nec.co.jp ([202.32.8.193]:45256 "EHLO
	tyo201.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org	with
 ESMTP id S1492076AbZJMCxP (ORCPT	<rfc822;linux-mips@linux-mips.org>); Tue, 13
 Oct 2009 04:53:15 +0200
Received: from relay21.aps.necel.com ([10.29.19.50])	by tyo201.gate.nec.co.jp
 (8.13.8/8.13.4) with ESMTP id n9D2r1Qe011534;	Tue, 13 Oct 2009 11:53:03 +0900
 (JST)
Received: from realmbox31.aps.necel.com ([10.29.19.36] [10.29.19.36]) by
 relay21.aps.necel.com with ESMTP; Tue, 13 Oct 2009 11:53:03 +0900
Received: from [10.114.180.134] ([10.114.180.134] [10.114.180.134]) by
 mbox02.aps.necel.com with ESMTP; Tue, 13 Oct 2009 11:53:03 +0900
From: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
To: "baruch@tkos.co.il" <baruch@tkos.co.il>, "linux-i2c@vger.kernel.org"
	<linux-i2c@vger.kernel.org>
CC: "ben-linux@fluff.org" <ben-linux@fluff.org>, "linux-mips@linux-mips.org"
	<linux-mips@linux-mips.org>, "linux-arm-kernel@lists.infradead.org"
	<linux-arm-kernel@lists.infradead.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Mon, 12 Oct 2009 20:53:11 -0600
Subject: [PATCH 13/16] i2c-designware: i2c_dw_xfer_msg: Introduce a local
 "buf" pointer
Thread-Topic: [PATCH 13/16] i2c-designware: i2c_dw_xfer_msg: Introduce a
 local "buf" pointer
Thread-Index: AcpLsHq/U/gN9PAlRQOKIntaUIHx7A==
Message-ID: <4AD3EB97.9060406@necel.com>
References: <4AD3E974.8080200@necel.com>
In-Reply-To: <4AD3E974.8080200@necel.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Anonymous
X-MS-Exchange-Organization-AuthSource: coscas01.lsi.com
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-scanned-by: MIMEDefang 2.39
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-pstn-settings: 3 (1.0000:1.0000) s cv gt3 gt2 gt1 r p m c 
x-pstn-addresses: from <shinya.kuribayashi@necel.com> [db-null] 
x-pstn-neptune: 0/0/0.00/0
user-agent: Thunderbird 2.0.0.23 (Windows/20090812)
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

While we have "buf_len" local variable 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're going to process a new i2c_msg
(in WRITE_IN_PROGRESS case), ->tx_buf is never done so.

Such inconsistency makes the code slightly hard to follow.

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
---

 Furthermore, even with this change, i2c_dw_xfer_msg() is still
 inconsistent with i2c_dw_read().  I don't have preference around
 here, but would like to sort out.  Any suggestions are welcome.

 drivers/i2c/busses/i2c-designware.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-d=
esignware.c
index de006f0..b3152c2 100644
--- a/drivers/i2c/busses/i2c-designware.c
+++ b/drivers/i2c/busses/i2c-designware.c
@@ -363,6 +363,7 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev)
 	int rx_limit =3D dev->rx_fifo_depth - readl(dev->base + DW_IC_RXFLR);
 	u32 addr =3D msgs[dev->msg_write_idx].addr;
 	u32 buf_len =3D dev->tx_buf_len;
+	u8 *buf =3D dev->tx_buf;;
=20
 	for (; dev->msg_write_idx < dev->msgs_num; dev->msg_write_idx++) {
 		/* if target address has changed, we need to
@@ -381,7 +382,7 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev)
=20
 		if (!(dev->status & STATUS_WRITE_IN_PROGRESS)) {
 			/* new i2c_msg */
-			dev->tx_buf =3D msgs[dev->msg_write_idx].buf;
+			buf	=3D msgs[dev->msg_write_idx].buf;
 			buf_len =3D msgs[dev->msg_write_idx].len;
 		}
=20
@@ -390,12 +391,12 @@ 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--;
 		}
=20
 		dev->tx_buf_len =3D buf_len;
+		dev->tx_buf =3D buf;
=20
 		/* more bytes to be written? */
 		if (buf_len > 0) {
--=20
1.6.5


