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@

2 files changed, 4 insertions, 4 deletions

diff --git a/sys/arch/loongson/dev/bonito.c b/sys/arch/loongson/dev/bonito.c
index 52ff0593f7c..57eac9d0e9e 100644
--- a/sys/arch/loongson/dev/bonito.c
+++ b/sys/arch/loongson/dev/bonito.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bonito.c,v 1.16 2010/08/31 10:24:46 pirofti Exp $	*/
+/*	$OpenBSD: bonito.c,v 1.17 2010/09/20 06:33:48 matthew Exp $	*/
 /*	$NetBSD: bonito_mainbus.c,v 1.11 2008/04/28 20:23:10 martin Exp $	*/
 /*	$NetBSD: bonito_pci.c,v 1.5 2008/04/28 20:23:28 martin Exp $	*/
 
@@ -400,7 +400,7 @@ bonito_intr_establish(int irq, int type, int level, int (*handler)(void *),
 	ih->ih_arg = arg;
 	ih->ih_level = level;
 	ih->ih_irq = irq;
-	evcount_attach(&ih->ih_count, name, (void *)&ih->ih_irq, &evcount_intr);
+	evcount_attach(&ih->ih_count, name, &ih->ih_irq);
 
 	s = splhigh();
 
diff --git a/sys/arch/loongson/dev/voyager.c b/sys/arch/loongson/dev/voyager.c
index 40aa6f2c0a8..19b0b15543c 100644
--- a/sys/arch/loongson/dev/voyager.c
+++ b/sys/arch/loongson/dev/voyager.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: voyager.c,v 1.3 2010/02/26 14:53:11 miod Exp $	*/
+/*	$OpenBSD: voyager.c,v 1.4 2010/09/20 06:33:48 matthew Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -252,7 +252,7 @@ voyager_intr_establish(void *cookie, int irq, int level, int (*fun)(void *),
 	nh->ih_arg = arg;
 	nh->ih_level = level;
 	nh->ih_irq = irq + BONITO_NINTS;
-	evcount_attach(&nh->ih_count, name, (void *)&nh->ih_irq, &evcount_intr);
+	evcount_attach(&nh->ih_count, name, &nh->ih_irq);
 
 	if (sc->sc_intr[irq] == NULL)
 		sc->sc_intr[irq] = nh;