From owner-svn-src-all@FreeBSD.ORG  Thu Feb 21 00:26:31 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id B13FE4CB;
 Thu, 21 Feb 2013 00:26:31 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A37987DF;
 Thu, 21 Feb 2013 00:26:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1L0QV9M091507;
 Thu, 21 Feb 2013 00:26:31 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1L0QVic091506;
 Thu, 21 Feb 2013 00:26:31 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201302210026.r1L0QVic091506@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 21 Feb 2013 00:26:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247065 - head/sys/dev/ppc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Feb 2013 00:26:31 -0000

Author: imp
Date: Thu Feb 21 00:26:31 2013
New Revision: 247065
URL: http://svnweb.freebsd.org/changeset/base/247065

Log:
  No longer need splhigh() since locking was done, delete it and
  comments about it.

Modified:
  head/sys/dev/ppc/ppc_isa.c

Modified: head/sys/dev/ppc/ppc_isa.c
==============================================================================
--- head/sys/dev/ppc/ppc_isa.c	Thu Feb 21 00:25:45 2013	(r247064)
+++ head/sys/dev/ppc/ppc_isa.c	Thu Feb 21 00:26:31 2013	(r247065)
@@ -141,7 +141,7 @@ ppc_isa_write(device_t dev, char *buf, i
 {
 	struct ppc_data *ppc = device_get_softc(dev);
 	char ecr, ecr_sav, ctr, ctr_sav;
-	int s, error = 0;
+	int error = 0;
 	int spin;
 
 	PPC_ASSERT_LOCKED(ppc);
@@ -190,12 +190,6 @@ ppc_isa_write(device_t dev, char *buf, i
 	w_ecr(ppc, ecr);
 	ecr = r_ecr(ppc);
 
-	/* enter splhigh() not to be preempted
-	 * by the dma interrupt, we may miss
-	 * the wakeup otherwise
-	 */
-	s = splhigh();
-
 	ppc->ppc_dmastat = PPC_DMA_INIT;
 
 	/* enable interrupts */
@@ -221,8 +215,6 @@ ppc_isa_write(device_t dev, char *buf, i
 		    "ppcdma", 0);
 	} while (error == EWOULDBLOCK);
 
-	splx(s);
-
 	if (error) {
 #ifdef PPC_DEBUG
 		printf("i");