svn commit: r247065 - head/sys/dev/ppc

Warner Losh imp at FreeBSD.org
Thu Feb 21 00:26:31 UTC 2013


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");


More information about the svn-src-all mailing list