Received: from mail.onstor.com (66.201.51.107) by exch1.onstor.net
 (10.0.0.225) with Microsoft SMTP Server id 8.1.311.2; Tue, 31 Mar 2009
 09:50:42 -0700
Received: from psmtp.com ([64.18.0.56]) by mail.onstor.com with Microsoft
 SMTPSVC(6.0.3790.3959);	 Tue, 31 Mar 2009 09:50:42 -0700
Received: from source ([213.58.128.207]) by exprod5mx260.postini.com
 ([64.18.4.10]) with SMTP;	Tue, 31 Mar 2009 09:50:42 PDT
Received: from localhost.localdomain ([127.0.0.1]:52615 "EHLO
	ftp.linux-mips.org") by ftp.linux-mips.org with ESMTP	id S20023963AbZCaQQG
 (ORCPT <rfc822;andy.sharp@onstor.com>);	Tue, 31 Mar 2009 17:16:06 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 31 Mar 2009 17:15:49
 +0100 (BST)
Received: from mba.ocn.ne.jp ([122.1.235.107]:7372 "HELO smtp.mba.ocn.ne.jp")
	by ftp.linux-mips.org with SMTP id S20023836AbZCaQPl (ORCPT
	<rfc822;linux-mips@linux-mips.org>); Tue, 31 Mar 2009 17:15:41 +0100
Received: from localhost.localdomain (p6205-ipad211funabasi.chiba.ocn.ne.jp
 [58.91.162.205])	by smtp.mba.ocn.ne.jp (Postfix) with ESMTP	id 2B80DA9E6;
 Wed,  1 Apr 2009 01:15:34 +0900 (JST)
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
To: Grant Grundler <grundler@google.com>
CC: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
	"linux-ide@vger.kernel.org" <linux-ide@vger.kernel.org>,
	"linux-mips@linux-mips.org" <linux-mips@linux-mips.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Tue, 31 Mar 2009 09:15:36 -0700
Subject: [PATCH] tx4939ide: remove wmb()
Thread-Topic: [PATCH] tx4939ide: remove wmb()
Thread-Index: AcmyINSK70aRNJweT4OmrJ8Ee7MCRA==
Message-ID: <1238516136-15852-1-git-send-email-anemo@mba.ocn.ne.jp>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Internal
X-MS-Exchange-Organization-AuthMechanism: 0b
X-MS-Exchange-Organization-AuthSource: exch1.onstor.net
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-originalarrivaltime: 31 Mar 2009 16:50:42.0327 (UTC)
 FILETIME=[D40FC270:01C9B220]
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:31.38064/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-neptune: 1/1/1.00/94
x-ems-proccessed: 2K3Xl1OQTInXD6xxuA8z3Q==
x-ems-stamp: d0TQ6Y+87DGFACwomOOQGA==
x-list: linux-mips
x-archive-position: 22202
x-ecartis-version: Ecartis v1.0.0
x-original-sender: anemo@mba.ocn.ne.jp
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

* define CHECK_DMA_MASK
* remove use of wmb()

Suggested-by: Grant Grundler <grundler@google.com>
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
This patch is against linux-next 20090331.

 drivers/ide/tx4939ide.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index cc269c0..48186ae 100644
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -327,15 +327,15 @@ static int tx4939ide_dma_end(ide_drive_t *drive)
 	/* read and clear the INTR & ERROR bits */
 	dma_stat =3D tx4939ide_clear_dma_status(base);
=20
-	wmb();
+#define CHECK_DMA_MASK (ATA_DMA_ACTIVE | ATA_DMA_ERR | ATA_DMA_INTR)
=20
 	/* verify good DMA status */
-	if ((dma_stat & (ATA_DMA_INTR | ATA_DMA_ERR | ATA_DMA_ACTIVE)) =3D=3D 0 &=
&
+	if ((dma_stat & CHECK_DMA_MASK) =3D=3D 0 &&
 	    (ctl & (TX4939IDE_INT_XFEREND | TX4939IDE_INT_HOST)) =3D=3D
 	    (TX4939IDE_INT_XFEREND | TX4939IDE_INT_HOST))
 		/* INT_IDE lost... bug? */
 		return 0;
-	return ((dma_stat & (ATA_DMA_INTR | ATA_DMA_ERR | ATA_DMA_ACTIVE)) !=3D
+	return ((dma_stat & CHECK_DMA_MASK) !=3D
 		ATA_DMA_INTR) ? 0x10 | dma_stat : 0;
 }
=20
--=20
1.5.6.3


