diff options
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/ic/ncr53c9x.c | 4 | ||||
-rw-r--r-- | sys/dev/ic/ncr53c9xvar.h | 3 | ||||
-rw-r--r-- | sys/dev/sbus/cs4231.c | 4 | ||||
-rw-r--r-- | sys/dev/sbus/cs4231var.h | 3 | ||||
-rw-r--r-- | sys/dev/sbus/esp_sbus.c | 5 |
5 files changed, 5 insertions, 14 deletions
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; |