[src/netbsd-1-4]: src/sys/dev/ic pullup 1.6->1.7 (pk)

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3e61ecbb2ed0
branches:  netbsd-1-4
changeset: 468429:3e61ecbb2ed0
user:      perry <perry%NetBSD.org@localhost>
date:      Fri Apr 23 15:11:18 1999 +0000

description:
pullup 1.6->1.7 (pk)

diffstat:

 sys/dev/ic/lsi64854.c |  6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 5d59bf118ac4 -r 3e61ecbb2ed0 sys/dev/ic/lsi64854.c
--- a/sys/dev/ic/lsi64854.c     Fri Apr 23 15:08:38 1999 +0000
+++ b/sys/dev/ic/lsi64854.c     Fri Apr 23 15:11:18 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lsi64854.c,v 1.5.2.1 1999/04/17 10:24:53 pk Exp $ */
+/*     $NetBSD: lsi64854.c,v 1.5.2.2 1999/04/23 15:11:18 perry Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -279,7 +279,6 @@
 
        /* Program the DMA address */
        if (sc->sc_dmasize) {
-               int s = splbio();
                sc->sc_dvmaaddr = *sc->sc_dmaaddr;
                if (bus_dmamap_load(sc->sc_dmatag, sc->sc_dmamap,
                                *sc->sc_dmaaddr, sc->sc_dmasize,
@@ -287,7 +286,6 @@
                                BUS_DMA_NOWAIT))
                        panic("%s: cannot allocate DVMA address",
                              sc->sc_dev.dv_xname);
-               splx(s);
                bus_dmamap_sync(sc->sc_dmatag, sc->sc_dmamap,
                                (bus_addr_t)sc->sc_dvmaaddr, sc->sc_dmasize,
                                datain
@@ -516,7 +514,6 @@
 
        /* Program the DMA address */
        if (sc->sc_dmasize) {
-               int s = splserial();    /* XXX - what shall we choose? */
                sc->sc_dvmaaddr = *sc->sc_dmaaddr;
                if (bus_dmamap_load(sc->sc_dmatag, sc->sc_dmamap,
                                *sc->sc_dmaaddr, sc->sc_dmasize,
@@ -524,7 +521,6 @@
                                BUS_DMA_NOWAIT))
                        panic("%s: cannot allocate DVMA address",
                              sc->sc_dev.dv_xname);
-               splx(s);
                bus_dmamap_sync(sc->sc_dmatag, sc->sc_dmamap,
                                (bus_addr_t)sc->sc_dvmaaddr, sc->sc_dmasize,
                                datain