summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2010-06-02 01:16:13 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2010-06-02 01:16:13 +0000
commit4152ba1dd983b7408db13fb627e2fc994e48c975 (patch)
tree375f8a23e5df2144b54035f3cf48a6b01ec0f3ec /sys/dev
parente8e5dccd913b8a525ed8e1e2653f46963337d7f2 (diff)
interrupt handlers are run at their IPL, so there's no need to go splbio
in a disk controllers handler, even if it has a useless bunch of macros around it.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/ciss.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c
index 99dd4e5eb22..96c23f96e71 100644
--- a/sys/dev/ic/ciss.c
+++ b/sys/dev/ic/ciss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ciss.c,v 1.43 2010/05/31 19:35:03 halex Exp $ */
+/* $OpenBSD: ciss.c,v 1.44 2010/06/02 01:16:12 dlg Exp $ */
/*
* Copyright (c) 2005,2006 Michael Shalayeff
@@ -984,7 +984,6 @@ ciss_intr(void *v)
{
struct ciss_softc *sc = v;
struct ciss_ccb *ccb;
- ciss_lock_t lock;
bus_size_t reg;
u_int32_t id;
int hit = 0;
@@ -994,8 +993,6 @@ ciss_intr(void *v)
if (!(bus_space_read_4(sc->iot, sc->ioh, CISS_ISR) & sc->iem))
return 0;
- lock = CISS_LOCK(sc);
-
if (sc->cfg.methods & CISS_METH_FIFO64)
reg = CISS_OUTQ64_HI;
else if (sc->cfg.methods & CISS_METH_FIFO64_RRO)
@@ -1020,8 +1017,6 @@ ciss_intr(void *v)
hit = 1;
}
- CISS_UNLOCK(sc, lock);
-
CISS_DPRINTF(CISS_D_INTR, ("exit "));
return hit;
}