summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2013-02-21 00:26:31 +0000
committerimp <imp@FreeBSD.org>2013-02-21 00:26:31 +0000
commit9412f39af7fe835fd54067c7516f4b3274a9b31d (patch)
tree927d4ebd2be5c9f711a47feb216681a5e2044921
parentbc67c0c4527ce6afb493c133aa64bce0a7e3c016 (diff)
downloadFreeBSD-src-9412f39af7fe835fd54067c7516f4b3274a9b31d.zip
FreeBSD-src-9412f39af7fe835fd54067c7516f4b3274a9b31d.tar.gz
No longer need splhigh() since locking was done, delete it and
comments about it.
-rw-r--r--sys/dev/ppc/ppc_isa.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/dev/ppc/ppc_isa.c b/sys/dev/ppc/ppc_isa.c
index 14424a3..a40fc8e 100644
--- a/sys/dev/ppc/ppc_isa.c
+++ b/sys/dev/ppc/ppc_isa.c
@@ -141,7 +141,7 @@ ppc_isa_write(device_t dev, char *buf, int len, int how)
{
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, int len, int how)
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, int len, int how)
"ppcdma", 0);
} while (error == EWOULDBLOCK);
- splx(s);
-
if (error) {
#ifdef PPC_DEBUG
printf("i");
OpenPOWER on IntegriCloud