summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/mvme68k/dev/sbicdma.c7
-rw-r--r--sys/arch/sparc64/dev/ce4231.c4
-rw-r--r--sys/arch/sparc64/dev/ce4231var.h3
-rw-r--r--sys/arch/sparc64/dev/zs.c6
-rw-r--r--sys/arch/sparc64/include/z8530var.h3
-rw-r--r--sys/dev/ic/ncr53c9x.c4
-rw-r--r--sys/dev/ic/ncr53c9xvar.h3
-rw-r--r--sys/dev/sbus/cs4231.c4
-rw-r--r--sys/dev/sbus/cs4231var.h3
-rw-r--r--sys/dev/sbus/esp_sbus.c5
10 files changed, 10 insertions, 32 deletions
diff --git a/sys/arch/mvme68k/dev/sbicdma.c b/sys/arch/mvme68k/dev/sbicdma.c
index 7cb03aae52e..9ecd0096927 100644
--- a/sys/arch/mvme68k/dev/sbicdma.c
+++ b/sys/arch/mvme68k/dev/sbicdma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbicdma.c,v 1.11 2004/07/30 22:29:45 miod Exp $ */
+/* $OpenBSD: sbicdma.c,v 1.12 2004/09/29 19:17:40 miod Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -138,9 +138,6 @@ sbicdmaattach(parent, self, args)
sbicreset(sc);
- evcnt_attach(&sc->sc_dev, "intr", &sc->sc_intrcnt);
- evcnt_attach(&sc->sc_dev, "intr", &sc->sc_dmaintrcnt);
-
config_found(self, &sc->sc_link, sbicdmaprint);
}
@@ -214,7 +211,6 @@ printf("dmaintr%d ", stat);
if (stat & PCC_DMACSR_DMAERRDATA) {
printf("%s: DMA bus error\n", sc->sc_dev.dv_xname);
}
- sc->sc_dmaintrcnt.ev_count++;
return (1);
}
return (0);
@@ -239,7 +235,6 @@ printf("scintr%d ", stat);
sys_pcc->pcc_sbicirq = 0;
sbicintr(sc);
ret = 1;
- sc->sc_intrcnt.ev_count++;
}
return (ret);
}
diff --git a/sys/arch/sparc64/dev/ce4231.c b/sys/arch/sparc64/dev/ce4231.c
index b2019b81182..b222bad1392 100644
--- a/sys/arch/sparc64/dev/ce4231.c
+++ b/sys/arch/sparc64/dev/ce4231.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ce4231.c,v 1.15 2003/06/24 21:54:39 henric Exp $ */
+/* $OpenBSD: ce4231.c,v 1.16 2004/09/29 19:17:43 miod Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -291,8 +291,6 @@ ce4231_attach(parent, self, aux)
printf(": nvaddrs %d\n", ea->ea_nvaddrs);
- evcnt_attach(&sc->sc_dev, "intr", &sc->sc_intrcnt);
-
audio_attach_mi(&ce4231_sa_hw_if, sc, &sc->sc_dev);
/* Default to speaker, unmuted, reasonable volume */
diff --git a/sys/arch/sparc64/dev/ce4231var.h b/sys/arch/sparc64/dev/ce4231var.h
index 20913eb2c54..269d78a6849 100644
--- a/sys/arch/sparc64/dev/ce4231var.h
+++ b/sys/arch/sparc64/dev/ce4231var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ce4231var.h,v 1.6 2003/06/02 20:02:49 jason Exp $ */
+/* $OpenBSD: ce4231var.h,v 1.7 2004/09/29 19:17:43 miod Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -62,7 +62,6 @@ struct ce4231_softc {
bus_space_handle_t sc_cdmahandle; /* capture DMA handle */
bus_space_handle_t sc_pdmahandle; /* playback DMA handle */
bus_space_handle_t sc_auxhandle; /* AUX handle */
- struct evcnt sc_intrcnt; /* statistics */
int sc_open; /* already open? */
int sc_locked; /* locked? */
diff --git a/sys/arch/sparc64/dev/zs.c b/sys/arch/sparc64/dev/zs.c
index d468a1c7dee..ac727abdc2b 100644
--- a/sys/arch/sparc64/dev/zs.c
+++ b/sys/arch/sparc64/dev/zs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zs.c,v 1.16 2004/09/28 18:37:43 jason Exp $ */
+/* $OpenBSD: zs.c,v 1.17 2004/09/29 19:17:43 miod Exp $ */
/* $NetBSD: zs.c,v 1.29 2001/05/30 15:24:24 lukem Exp $ */
/*-
@@ -453,9 +453,6 @@ zs_attach(zsc, zsd, pri)
if (!(zsc->zsc_softintr = softintr_establish(softpri, zssoft, zsc)))
panic("zsattach: could not establish soft interrupt");
- evcnt_attach(&zsc->zsc_dev, "intr", &zsc->zsc_intrcnt);
-
-
/*
* Set the master interrupt enable and interrupt vector.
* (common to both channels, do it on A)
@@ -500,7 +497,6 @@ zshard(arg)
while ((rr3 = zsc_intr_hard(zsc))) {
/* Count up the interrupts. */
rval |= rr3;
- zsc->zsc_intrcnt.ev_count++;
}
if (((zsc->zsc_cs[0] && zsc->zsc_cs[0]->cs_softreq) ||
(zsc->zsc_cs[1] && zsc->zsc_cs[1]->cs_softreq)) &&
diff --git a/sys/arch/sparc64/include/z8530var.h b/sys/arch/sparc64/include/z8530var.h
index dcfd8d393f6..1543808eb43 100644
--- a/sys/arch/sparc64/include/z8530var.h
+++ b/sys/arch/sparc64/include/z8530var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530var.h,v 1.5 2003/06/02 23:27:56 millert Exp $ */
+/* $OpenBSD: z8530var.h,v 1.6 2004/09/29 19:17:43 miod Exp $ */
/* $NetBSD: z8530var.h,v 1.4 2000/11/08 23:41:42 eeh Exp $ */
/*
@@ -64,7 +64,6 @@ struct zsc_softc {
void *zsc_softintr;
int zsc_promunit; /* PROM's view of zs devices */
int zsc_node; /* PROM node, if any */
- struct evcnt zsc_intrcnt; /* count interrupts */
struct zs_chanstate zsc_cs_store[2];
};
diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c
index 8992f52a7fb..becd007141c 100644
--- a/sys/dev/ic/ncr53c9x.c
+++ b/sys/dev/ic/ncr53c9x.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr53c9x.c,v 1.23 2004/06/21 23:50:35 tholo Exp $ */
+/* $OpenBSD: ncr53c9x.c,v 1.24 2004/09/29 19:17:43 miod Exp $ */
/* $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $ */
/*
@@ -1929,8 +1929,6 @@ again:
/* and what do the registers say... */
ncr53c9x_readregs(sc);
- sc->sc_intrcnt.ev_count++;
-
/*
* At the moment, only a SCSI Bus Reset or Illegal
* Command are classed as errors. A disconnect is a
diff --git a/sys/dev/ic/ncr53c9xvar.h b/sys/dev/ic/ncr53c9xvar.h
index 8c7cba97abf..07b6a012a7f 100644
--- a/sys/dev/ic/ncr53c9xvar.h
+++ b/sys/dev/ic/ncr53c9xvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr53c9xvar.h,v 1.14 2003/10/21 18:58:49 jmc Exp $ */
+/* $OpenBSD: ncr53c9xvar.h,v 1.15 2004/09/29 19:17:43 miod Exp $ */
/* $NetBSD: ncr53c9xvar.h,v 1.13 1998/05/26 23:17:34 thorpej Exp $ */
/*-
@@ -263,7 +263,6 @@ struct ncr53c9x_glue {
struct ncr53c9x_softc {
struct device sc_dev; /* us as a device */
- struct evcnt sc_intrcnt; /* intr count */
struct timeout sc_watchdog; /* periodic timer */
struct scsi_link sc_link; /* scsi link struct */
diff --git a/sys/dev/sbus/cs4231.c b/sys/dev/sbus/cs4231.c
index 13ca9ed9d2f..6b4e9177256 100644
--- a/sys/dev/sbus/cs4231.c
+++ b/sys/dev/sbus/cs4231.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cs4231.c,v 1.21 2003/07/03 20:36:07 jason Exp $ */
+/* $OpenBSD: cs4231.c,v 1.22 2004/09/29 19:17:43 miod Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -261,8 +261,6 @@ cs4231_attach(struct device *parent, struct device *self, void *aux)
printf("\n");
- evcnt_attach(&sc->sc_dev, "intr", &sc->sc_intrcnt);
-
audio_attach_mi(&cs4231_sa_hw_if, sc, &sc->sc_dev);
/* Default to speaker, unmuted, reasonable volume */
diff --git a/sys/dev/sbus/cs4231var.h b/sys/dev/sbus/cs4231var.h
index 7933602dc5c..185521db457 100644
--- a/sys/dev/sbus/cs4231var.h
+++ b/sys/dev/sbus/cs4231var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cs4231var.h,v 1.7 2003/06/02 18:32:41 jason Exp $ */
+/* $OpenBSD: cs4231var.h,v 1.8 2004/09/29 19:17:43 miod Exp $ */
/*
* Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -69,7 +69,6 @@ struct cs4231_softc {
bus_dma_tag_t sc_dmatag;
bus_space_tag_t sc_bustag; /* CS4231/APC register tag */
bus_space_handle_t sc_regs; /* CS4231/APC register handle */
- struct evcnt sc_intrcnt; /* statistics */
int sc_burst; /* XXX: DMA burst size in effect */
int sc_open; /* already open? */
diff --git a/sys/dev/sbus/esp_sbus.c b/sys/dev/sbus/esp_sbus.c
index 545954329e4..82c0e035c9b 100644
--- a/sys/dev/sbus/esp_sbus.c
+++ b/sys/dev/sbus/esp_sbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esp_sbus.c,v 1.15 2003/07/03 21:02:13 jason Exp $ */
+/* $OpenBSD: esp_sbus.c,v 1.16 2004/09/29 19:17:43 miod Exp $ */
/* $NetBSD: esp_sbus.c,v 1.14 2001/04/25 17:53:37 bouyer Exp $ */
/*-
@@ -530,9 +530,6 @@ espattach(struct esp_softc *esc, struct ncr53c9x_glue *gluep)
icookie = bus_intr_establish(esc->sc_bustag, esc->sc_pri, IPL_BIO, 0,
ncr53c9x_intr, sc, sc->sc_dev.dv_xname);
- /* register interrupt stats */
- evcnt_attach(&sc->sc_dev, "intr", &sc->sc_intrcnt);
-
/* Turn on target selection using the `dma' method */
if (sc->sc_rev != NCR_VARIANT_FAS366)
sc->sc_features |= NCR_F_DMASELECT;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 03:55:26 +0000