Remove the dma_eop callback in the ncr5380 driver md attachment, it was always

doing nothing and the mi code does not use it anymore anyway. No functional
change.

6 files changed, 6 insertions, 50 deletions

diff --git a/sys/arch/mac68k/dev/sbc.c b/sys/arch/mac68k/dev/sbc.c
index 86402dbe17d..5d69060cd94 100644
--- a/sys/arch/mac68k/dev/sbc.c
+++ b/sys/arch/mac68k/dev/sbc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbc.c,v 1.15 2004/12/02 06:43:25 miod Exp $	*/
+/*	$OpenBSD: sbc.c,v 1.16 2006/12/13 21:12:56 miod Exp $	*/
 /*	$NetBSD: sbc.c,v 1.24 1997/04/18 17:38:08 scottr Exp $	*/
 
 /*
@@ -719,13 +719,6 @@ sbc_dma_start(ncr_sc)
 }
 
 void
-sbc_dma_eop(ncr_sc)
-	struct ncr5380_softc *ncr_sc;
-{
-	/* Not used; the EOP pin is wired high (GMFH, pp. 389-390) */
-}
-
-void
 sbc_dma_stop(ncr_sc)
 	struct ncr5380_softc *ncr_sc;
 {
diff --git a/sys/arch/mac68k/dev/sbc_obio.c b/sys/arch/mac68k/dev/sbc_obio.c
index acc2afec409..7c4d00e9c0a 100644
--- a/sys/arch/mac68k/dev/sbc_obio.c
+++ b/sys/arch/mac68k/dev/sbc_obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbc_obio.c,v 1.14 2006/11/28 23:59:45 dlg Exp $	*/
+/*	$OpenBSD: sbc_obio.c,v 1.15 2006/12/13 21:12:56 miod Exp $	*/
 /*	$NetBSD: sbc_obio.c,v 1.1 1997/03/01 20:18:59 scottr Exp $	*/
 
 /*
@@ -199,7 +199,6 @@ sbc_obio_attach(parent, self, args)
 	ncr_sc->sc_intr_off  = NULL;
 	ncr_sc->sc_dma_setup = NULL;
 	ncr_sc->sc_dma_start = NULL;
-	ncr_sc->sc_dma_eop   = NULL;
 	ncr_sc->sc_dma_stop  = NULL;
 	ncr_sc->sc_flags = 0;
 	ncr_sc->sc_min_dma_len = MIN_DMA_LEN;
@@ -210,7 +209,6 @@ sbc_obio_attach(parent, self, args)
 		ncr_sc->sc_dma_poll  = sbc_dma_poll;
 		ncr_sc->sc_dma_setup = sbc_dma_setup;
 		ncr_sc->sc_dma_start = sbc_dma_start;
-		ncr_sc->sc_dma_eop   = sbc_dma_eop;
 		ncr_sc->sc_dma_stop  = sbc_dma_stop;
 
 		sc->sc_ih_drq.vh_fn = sbc_drq_intr;
diff --git a/sys/arch/mac68k/dev/sbcvar.h b/sys/arch/mac68k/dev/sbcvar.h
index 60391a282fd..acd78c3de51 100644
--- a/sys/arch/mac68k/dev/sbcvar.h
+++ b/sys/arch/mac68k/dev/sbcvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbcvar.h,v 1.7 2006/04/14 09:36:49 martin Exp $	*/
+/*	$OpenBSD: sbcvar.h,v 1.8 2006/12/13 21:12:56 miod Exp $	*/
 /*	$NetBSD: sbcvar.h,v 1.1 1997/03/01 20:19:00 scottr Exp $	*/
 
 /*
@@ -117,7 +117,6 @@ void	sbc_dma_free(struct ncr5380_softc *);
 void	sbc_dma_poll(struct ncr5380_softc *);
 void	sbc_dma_setup(struct ncr5380_softc *);
 void	sbc_dma_start(struct ncr5380_softc *);
-void	sbc_dma_eop(struct ncr5380_softc *);
 void	sbc_dma_stop(struct ncr5380_softc *);
 #ifdef SBC_DEBUG
 void	decode_5380_intr(struct ncr5380_softc *);
diff --git a/sys/arch/sparc/dev/si.c b/sys/arch/sparc/dev/si.c
index bef22782b14..7e00384436e 100644
--- a/sys/arch/sparc/dev/si.c
+++ b/sys/arch/sparc/dev/si.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: si.c,v 1.24 2006/12/10 16:15:03 miod Exp $	*/
+/*	$OpenBSD: si.c,v 1.25 2006/12/13 21:12:58 miod Exp $	*/
 /*	$NetBSD: si.c,v 1.38 1997/08/27 11:24:20 bouyer Exp $	*/
 
 /*-
@@ -206,7 +206,6 @@ void si_dma_poll(struct ncr5380_softc *);
 
 void si_vme_dma_setup(struct ncr5380_softc *);
 void si_vme_dma_start(struct ncr5380_softc *);
-void si_vme_dma_eop(struct ncr5380_softc *);
 void si_vme_dma_stop(struct ncr5380_softc *);
 
 void si_vme_intr_on(struct ncr5380_softc *);
@@ -214,7 +213,6 @@ void si_vme_intr_off(struct ncr5380_softc *);
 
 void si_obio_dma_setup(struct ncr5380_softc *);
 void si_obio_dma_start(struct ncr5380_softc *);
-void si_obio_dma_eop(struct ncr5380_softc *);
 void si_obio_dma_stop(struct ncr5380_softc *);
 
 void si_obio_intr_on(struct ncr5380_softc *);
@@ -379,7 +377,6 @@ si_attach(parent, self, args)
 		if (sc->sc_options & SI_ENABLE_DMA) {
 			ncr_sc->sc_dma_setup = si_vme_dma_setup;
 			ncr_sc->sc_dma_start = si_vme_dma_start;
-			ncr_sc->sc_dma_eop   = si_vme_dma_stop;
 			ncr_sc->sc_dma_stop  = si_vme_dma_stop;
 			if (sc->sc_options & SI_DO_RESELECT) {
 				/*
@@ -396,7 +393,6 @@ si_attach(parent, self, args)
 		if (sc->sc_options & SI_ENABLE_DMA) {
 			ncr_sc->sc_dma_setup = si_obio_dma_setup;
 			ncr_sc->sc_dma_start = si_obio_dma_start;
-			ncr_sc->sc_dma_eop   = si_obio_dma_stop;
 			ncr_sc->sc_dma_stop  = si_obio_dma_stop;
 		}
 		ncr_sc->sc_intr_on   = si_obio_intr_on;
@@ -958,15 +954,6 @@ si_vme_dma_start(ncr_sc)
 
 
 void
-si_vme_dma_eop(ncr_sc)
-	struct ncr5380_softc *ncr_sc;
-{
-
-	/* Not needed - DMA was stopped prior to examining sci_csr */
-}
-
-
-void
 si_vme_dma_stop(ncr_sc)
 	struct ncr5380_softc *ncr_sc;
 {
@@ -1264,14 +1251,6 @@ si_obio_dma_start(ncr_sc)
 }
 
 
-void
-si_obio_dma_eop(ncr_sc)
-	struct ncr5380_softc *ncr_sc;
-{
-
-	/* Not needed - DMA was stopped prior to examining sci_csr */
-}
-
 #if (defined(DEBUG) || defined(DIAGNOSTIC)) && !defined(COUNT_SW_LEFTOVERS)
 #define COUNT_SW_LEFTOVERS
 #endif
diff --git a/sys/arch/vax/vsa/ncr.c b/sys/arch/vax/vsa/ncr.c
index b5a24c1481b..fd33ad627a7 100644
--- a/sys/arch/vax/vsa/ncr.c
+++ b/sys/arch/vax/vsa/ncr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr.c,v 1.20 2006/11/28 23:59:45 dlg Exp $ */
+/* $OpenBSD: ncr.c,v 1.21 2006/12/13 21:12:58 miod Exp $ */
 /*	$NetBSD: ncr.c,v 1.32 2000/06/25 16:00:43 ragge Exp $	*/
 
 /*-
@@ -118,7 +118,6 @@ static	void si_dma_free(struct ncr5380_softc *);
 static	void si_dma_setup(struct ncr5380_softc *);
 static	void si_dma_start(struct ncr5380_softc *);
 static	void si_dma_poll(struct ncr5380_softc *);
-static	void si_dma_eop(struct ncr5380_softc *);
 static	void si_dma_stop(struct ncr5380_softc *);
 static	void si_dma_go(void *);
 
@@ -209,7 +208,6 @@ si_attach(parent, self, aux)
 	ncr_sc->sc_dma_setup = si_dma_setup;
 	ncr_sc->sc_dma_start = si_dma_start;
 	ncr_sc->sc_dma_poll  = si_dma_poll;
-	ncr_sc->sc_dma_eop   = si_dma_eop;
 	ncr_sc->sc_dma_stop  = si_dma_stop;
 
 	/* DMA control register offsets */
@@ -442,16 +440,6 @@ si_dma_poll(ncr_sc)
 	printf("si_dma_poll\n");
 }
 
-/*
- * When?
- */
-void
-si_dma_eop(ncr_sc)
-	struct ncr5380_softc *ncr_sc;
-{
-	printf("si_dma_eop\n");
-}
-
 void
 si_dma_stop(ncr_sc)
 	struct ncr5380_softc *ncr_sc;
diff --git a/sys/dev/ic/ncr5380var.h b/sys/dev/ic/ncr5380var.h
index adb27b51ab1..46ac6c67767 100644
--- a/sys/dev/ic/ncr5380var.h
+++ b/sys/dev/ic/ncr5380var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr5380var.h,v 1.10 2003/10/21 18:58:49 jmc Exp $	*/
+/*	$OpenBSD: ncr5380var.h,v 1.11 2006/12/13 21:12:58 miod Exp $	*/
 /*	$NetBSD: ncr5380var.h,v 1.6 1996/05/10 18:04:06 gwr Exp $	*/
 
 /*
@@ -103,7 +103,6 @@ struct ncr5380_softc {
 	void		(*sc_dma_setup)(struct ncr5380_softc *);
 	void		(*sc_dma_start)(struct ncr5380_softc *);
 	void		(*sc_dma_poll)(struct ncr5380_softc *);
-	void		(*sc_dma_eop)(struct ncr5380_softc *);
 	void		(*sc_dma_stop)(struct ncr5380_softc *);
 
 	void		(*sc_intr_on)(struct ncr5380_softc *);