Get rid of evcount's support for arranging counters in a tree

hierarchy.  Everything attached to a single root node anyway, so at
best we had a bush.

"i think it is good" deraadt@

5 files changed, 10 insertions, 11 deletions

diff --git a/sys/arch/alpha/alpha/clock.c b/sys/arch/alpha/alpha/clock.c
index c8c46e357bb..9f4fbeb4fd7 100644
--- a/sys/arch/alpha/alpha/clock.c
+++ b/sys/arch/alpha/alpha/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.19 2010/06/30 20:38:49 tedu Exp $	*/
+/*	$OpenBSD: clock.c,v 1.20 2010/09/20 06:33:46 matthew Exp $	*/
 /*	$NetBSD: clock.c,v 1.29 2000/06/05 21:47:10 thorpej Exp $	*/
 
 /*
@@ -132,7 +132,7 @@ cpu_initclocks(void)
 	platform.clockintr = hardclock;
 	schedhz = 16;
 
-	evcount_attach(&clk_count, "clock", (void *)&clk_irq, &evcount_intr);
+	evcount_attach(&clk_count, "clock", &clk_irq);
 
 	/*
 	 * Get the clock started.
diff --git a/sys/arch/alpha/dev/shared_intr.c b/sys/arch/alpha/dev/shared_intr.c
index d2f76c18b5c..a0fdb4ca9b6 100644
--- a/sys/arch/alpha/dev/shared_intr.c
+++ b/sys/arch/alpha/dev/shared_intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: shared_intr.c,v 1.16 2009/09/30 20:16:22 miod Exp $ */
+/* $OpenBSD: shared_intr.c,v 1.17 2010/09/20 06:33:46 matthew Exp $ */
 /* $NetBSD: shared_intr.c,v 1.13 2000/03/19 01:46:18 thorpej Exp $ */
 
 /*
@@ -170,8 +170,7 @@ alpha_shared_intr_establish(intr, num, type, level, fn, arg, basename)
 	ih->ih_arg = arg;
 	ih->ih_level = level;
 	ih->ih_num = num;
-	evcount_attach(&ih->ih_count, basename, (void *)&ih->ih_num,
-	    &evcount_intr);
+	evcount_attach(&ih->ih_count, basename, &ih->ih_num);
 
 	intr[num].intr_sharetype = type;
 	TAILQ_INSERT_TAIL(&intr[num].intr_q, ih, ih_q);
diff --git a/sys/arch/alpha/tc/ioasic.c b/sys/arch/alpha/tc/ioasic.c
index d3542e8d409..facb9918959 100644
--- a/sys/arch/alpha/tc/ioasic.c
+++ b/sys/arch/alpha/tc/ioasic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ioasic.c,v 1.16 2009/11/07 23:01:38 miod Exp $ */
+/* $OpenBSD: ioasic.c,v 1.17 2010/09/20 06:33:46 matthew Exp $ */
 /* $NetBSD: ioasic.c,v 1.34 2000/07/18 06:10:06 thorpej Exp $ */
 
 /*-
@@ -230,7 +230,7 @@ ioasic_intr_establish(ioa, cookie, level, func, arg, name)
 
 	ioasicintrs[dev].iai_func = func;
 	ioasicintrs[dev].iai_arg = arg;
-	evcount_attach(&ioasicintrs[dev].iai_count, name, NULL, &evcount_intr);
+	evcount_attach(&ioasicintrs[dev].iai_count, name, NULL);
 
 	/* Enable interrupts for the device. */
 	for (i = 0; i < ioasic_ndevs; i++)
diff --git a/sys/arch/alpha/tc/tc_3000_300.c b/sys/arch/alpha/tc/tc_3000_300.c
index a8b507f6983..eae1461e2f0 100644
--- a/sys/arch/alpha/tc/tc_3000_300.c
+++ b/sys/arch/alpha/tc/tc_3000_300.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tc_3000_300.c,v 1.14 2008/08/09 16:42:29 miod Exp $ */
+/* $OpenBSD: tc_3000_300.c,v 1.15 2010/09/20 06:33:46 matthew Exp $ */
 /* $NetBSD: tc_3000_300.c,v 1.26 2001/07/27 00:25:21 thorpej Exp $ */
 
 /*
@@ -130,7 +130,7 @@ tc_3000_300_intr_establish(tcadev, cookie, level, func, arg, name)
 	tc_3000_300_intr[dev].tci_arg = arg;
 	if (name != NULL)
 		evcount_attach(&tc_3000_300_intr[dev].tci_count,
-		    name, NULL, &evcount_intr);
+		    name, NULL);
 
 	imskp = (volatile u_int32_t *)(DEC_3000_300_IOASIC_ADDR + IOASIC_IMSK);
 	switch (dev) {
diff --git a/sys/arch/alpha/tc/tc_3000_500.c b/sys/arch/alpha/tc/tc_3000_500.c
index a85ed01fb05..328f92180d9 100644
--- a/sys/arch/alpha/tc/tc_3000_500.c
+++ b/sys/arch/alpha/tc/tc_3000_500.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tc_3000_500.c,v 1.15 2008/08/09 16:42:29 miod Exp $ */
+/* $OpenBSD: tc_3000_500.c,v 1.16 2010/09/20 06:33:46 matthew Exp $ */
 /* $NetBSD: tc_3000_500.c,v 1.24 2001/07/27 00:25:21 thorpej Exp $ */
 
 /*
@@ -147,7 +147,7 @@ tc_3000_500_intr_establish(tcadev, cookie, level, func, arg, name)
 	tc_3000_500_intr[dev].tci_arg = arg;
 	if (name != NULL)
 		evcount_attach(&tc_3000_500_intr[dev].tci_count,
-		    name, NULL, &evcount_intr);
+		    name, NULL);
 
 	tc_3000_500_imask &= ~tc_3000_500_intrbits[dev];
 	*(volatile u_int32_t *)TC_3000_500_IMR_WRITE = tc_3000_500_imask;