diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2010-09-20 06:33:49 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2010-09-20 06:33:49 +0000 |
| commit | 3e3ff0cf0db089f1bc7cf6089dc74b51d0a3af70 (patch) | |
| tree | fdd209a91e26cb3cbc1a90545f99b5db0880c7ce /sys/arch/arm/xscale | |
| parent | ee9bd637e0295eeb7dfd37b2f3810841cbd814f7 (diff) | |
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@
Diffstat (limited to 'sys/arch/arm/xscale')
| -rw-r--r-- | sys/arch/arm/xscale/i80321_clock.c | 6 | ||||
| -rw-r--r-- | sys/arch/arm/xscale/i80321_intr.c | 5 | ||||
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0_gpio.c | 4 | ||||
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0_intr.c | 5 |
4 files changed, 9 insertions, 11 deletions
diff --git a/sys/arch/arm/xscale/i80321_clock.c b/sys/arch/arm/xscale/i80321_clock.c index bdc346ba4e9..dc72db0e0e5 100644 --- a/sys/arch/arm/xscale/i80321_clock.c +++ b/sys/arch/arm/xscale/i80321_clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i80321_clock.c,v 1.8 2008/02/14 19:53:22 drahn Exp $ */ +/* $OpenBSD: i80321_clock.c,v 1.9 2010/09/20 06:33:47 matthew Exp $ */ /* * Copyright (c) 2006 Dale Rahn <drahn@openbsd.org> @@ -320,8 +320,8 @@ cpu_initclocks() ticks_per_intr = ticks_per_second / hz; - evcount_attach(&clk_count, "clock", (void *)&clk_irq, &evcount_intr); - evcount_attach(&stat_count, "stat", (void *)&stat_irq, &evcount_intr); + evcount_attach(&clk_count, "clock", &clk_irq); + evcount_attach(&stat_count, "stat", &stat_irq); (void) i80321_intr_establish(ICU_INT_TMR0, IPL_CLOCK, i80321_intr, NULL, NULL); diff --git a/sys/arch/arm/xscale/i80321_intr.c b/sys/arch/arm/xscale/i80321_intr.c index 40da0d38489..58e032074b7 100644 --- a/sys/arch/arm/xscale/i80321_intr.c +++ b/sys/arch/arm/xscale/i80321_intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i80321_intr.c,v 1.13 2009/08/22 02:54:50 mk Exp $ */ +/* $OpenBSD: i80321_intr.c,v 1.14 2010/09/20 06:33:47 matthew Exp $ */ /* * Copyright (c) 2006 Dale Rahn <drahn@openbsd.org> @@ -323,8 +323,7 @@ i80321_intr_establish(int irq, int ipl, int (*func)(void *), void *arg, iq = &i80321_handler[irq]; if (name != NULL) - evcount_attach(&ih->ih_count, name, (void *)&ih->ih_irq, - &evcount_intr); + evcount_attach(&ih->ih_count, name, &ih->ih_irq); /* All IOP321 interrupts are level-triggered. */ iq->iq_ist = IST_LEVEL; diff --git a/sys/arch/arm/xscale/pxa2x0_gpio.c b/sys/arch/arm/xscale/pxa2x0_gpio.c index e6dc20a4400..9d94b3d4273 100644 --- a/sys/arch/arm/xscale/pxa2x0_gpio.c +++ b/sys/arch/arm/xscale/pxa2x0_gpio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa2x0_gpio.c,v 1.21 2009/08/22 02:54:50 mk Exp $ */ +/* $OpenBSD: pxa2x0_gpio.c,v 1.22 2010/09/20 06:33:47 matthew Exp $ */ /* $NetBSD: pxa2x0_gpio.c,v 1.2 2003/07/15 00:24:55 lukem Exp $ */ /* @@ -239,7 +239,7 @@ pxa2x0_gpio_intr_establish(u_int gpio, int level, int spl, int (*func)(void *), gh->gh_gpio = gpio; gh->gh_irq = gpio+32; gh->gh_level = level; - evcount_attach(&gh->gh_count, name, (void *)&gh->gh_irq, &evcount_intr); + evcount_attach(&gh->gh_count, name, &gh->gh_irq); gh->gh_next = sc->sc_handlers[gpio]; sc->sc_handlers[gpio] = gh; diff --git a/sys/arch/arm/xscale/pxa2x0_intr.c b/sys/arch/arm/xscale/pxa2x0_intr.c index ff96cfd19c4..20b4d446835 100644 --- a/sys/arch/arm/xscale/pxa2x0_intr.c +++ b/sys/arch/arm/xscale/pxa2x0_intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa2x0_intr.c,v 1.20 2009/08/26 20:31:43 deraadt Exp $ */ +/* $OpenBSD: pxa2x0_intr.c,v 1.21 2010/09/20 06:33:47 matthew Exp $ */ /* $NetBSD: pxa2x0_intr.c,v 1.5 2003/07/15 00:24:55 lukem Exp $ */ /* @@ -567,8 +567,7 @@ pxa2x0_intr_establish(int irqno, int level, #endif if (name != NULL) - evcount_attach(&ih->ih_count, name, (void *)&ih->ih_irq, - &evcount_intr); + evcount_attach(&ih->ih_count, name, &ih->ih_irq); #ifdef MULTIPLE_HANDLERS_ON_ONE_IRQ pxa2x0_update_intr_masks(); |