From d60f5ac2a05c7298351eb975037920c7eda79580 Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Wed, 30 Sep 2009 20:16:32 +0000 Subject: Remove unused last argument of alpha_shared_intr_disestablish(). --- sys/arch/alpha/dev/shared_intr.c | 5 ++--- sys/arch/alpha/include/intr.h | 5 ++--- sys/arch/alpha/pci/pci_1000.c | 5 ++--- sys/arch/alpha/pci/pci_1000a.c | 5 ++--- sys/arch/alpha/pci/pci_550.c | 5 ++--- sys/arch/alpha/pci/pci_6600.c | 8 +++----- sys/arch/alpha/pci/pci_eb164.c | 5 ++--- sys/arch/alpha/pci/pci_eb64plus.c | 5 ++--- sys/arch/alpha/pci/pci_kn20aa.c | 5 ++--- sys/arch/alpha/pci/sio_pic.c | 4 ++-- 10 files changed, 21 insertions(+), 31 deletions(-) (limited to 'sys/arch') diff --git a/sys/arch/alpha/dev/shared_intr.c b/sys/arch/alpha/dev/shared_intr.c index b5d8f8c9480..d2f76c18b5c 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.15 2006/06/15 20:08:29 brad Exp $ */ +/* $OpenBSD: shared_intr.c,v 1.16 2009/09/30 20:16:22 miod Exp $ */ /* $NetBSD: shared_intr.c,v 1.13 2000/03/19 01:46:18 thorpej Exp $ */ /* @@ -180,10 +180,9 @@ alpha_shared_intr_establish(intr, num, type, level, fn, arg, basename) } void -alpha_shared_intr_disestablish(intr, cookie, basename) +alpha_shared_intr_disestablish(intr, cookie) struct alpha_shared_intr *intr; void *cookie; - const char *basename; { struct alpha_shared_intrhand *ih = cookie; unsigned int num = ih->ih_num; diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h index ed180370aee..6e8cb65725d 100644 --- a/sys/arch/alpha/include/intr.h +++ b/sys/arch/alpha/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.33 2009/03/25 21:41:41 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.34 2009/09/30 20:16:29 miod Exp $ */ /* $NetBSD: intr.h,v 1.26 2000/06/03 20:47:41 thorpej Exp $ */ /*- @@ -274,8 +274,7 @@ int alpha_shared_intr_dispatch(struct alpha_shared_intr *, unsigned int); void *alpha_shared_intr_establish(struct alpha_shared_intr *, unsigned int, int, int, int (*)(void *), void *, const char *); -void alpha_shared_intr_disestablish(struct alpha_shared_intr *, - void *, const char *); +void alpha_shared_intr_disestablish(struct alpha_shared_intr *, void *); int alpha_shared_intr_get_sharetype(struct alpha_shared_intr *, unsigned int); int alpha_shared_intr_isactive(struct alpha_shared_intr *, diff --git a/sys/arch/alpha/pci/pci_1000.c b/sys/arch/alpha/pci/pci_1000.c index 5a88e95e7b5..69b2ca92f16 100644 --- a/sys/arch/alpha/pci/pci_1000.c +++ b/sys/arch/alpha/pci/pci_1000.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_1000.c,v 1.9 2009/08/22 02:54:50 mk Exp $ */ +/* $OpenBSD: pci_1000.c,v 1.10 2009/09/30 20:16:30 miod Exp $ */ /* $NetBSD: pci_1000.c,v 1.12 2001/07/27 00:25:20 thorpej Exp $ */ /* @@ -234,8 +234,7 @@ dec_1000_intr_disestablish(ccv, cookie) s = splhigh(); - alpha_shared_intr_disestablish(dec_1000_pci_intr, cookie, - "dec_1000 irq"); + alpha_shared_intr_disestablish(dec_1000_pci_intr, cookie); if (alpha_shared_intr_isactive(dec_1000_pci_intr, irq) == 0) { dec_1000_disable_intr(irq); alpha_shared_intr_set_dfltsharetype(dec_1000_pci_intr, irq, diff --git a/sys/arch/alpha/pci/pci_1000a.c b/sys/arch/alpha/pci/pci_1000a.c index c1a467eea2b..75d9f2e262f 100644 --- a/sys/arch/alpha/pci/pci_1000a.c +++ b/sys/arch/alpha/pci/pci_1000a.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_1000a.c,v 1.11 2009/08/22 02:54:50 mk Exp $ */ +/* $OpenBSD: pci_1000a.c,v 1.12 2009/09/30 20:16:30 miod Exp $ */ /* $NetBSD: pci_1000a.c,v 1.14 2001/07/27 00:25:20 thorpej Exp $ */ /* @@ -295,8 +295,7 @@ dec_1000a_intr_disestablish(ccv, cookie) s = splhigh(); - alpha_shared_intr_disestablish(dec_1000a_pci_intr, cookie, - "dec_1000a irq"); + alpha_shared_intr_disestablish(dec_1000a_pci_intr, cookie); if (alpha_shared_intr_isactive(dec_1000a_pci_intr, irq) == 0) { dec_1000a_disable_intr(irq); alpha_shared_intr_set_dfltsharetype(dec_1000a_pci_intr, irq, diff --git a/sys/arch/alpha/pci/pci_550.c b/sys/arch/alpha/pci/pci_550.c index 11be1487938..b34c1e752f7 100644 --- a/sys/arch/alpha/pci/pci_550.c +++ b/sys/arch/alpha/pci/pci_550.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_550.c,v 1.20 2009/08/22 02:54:50 mk Exp $ */ +/* $OpenBSD: pci_550.c,v 1.21 2009/09/30 20:16:30 miod Exp $ */ /* $NetBSD: pci_550.c,v 1.18 2000/06/29 08:58:48 mrg Exp $ */ /*- @@ -340,8 +340,7 @@ dec_550_intr_disestablish(ccv, cookie) s = splhigh(); - alpha_shared_intr_disestablish(dec_550_pci_intr, cookie, - "dec 550 irq"); + alpha_shared_intr_disestablish(dec_550_pci_intr, cookie); if (alpha_shared_intr_isactive(dec_550_pci_intr, irq) == 0) { dec_550_intr_disable(irq); alpha_shared_intr_set_dfltsharetype(dec_550_pci_intr, irq, diff --git a/sys/arch/alpha/pci/pci_6600.c b/sys/arch/alpha/pci/pci_6600.c index 6a1c9f7f78b..a857ac28ac1 100644 --- a/sys/arch/alpha/pci/pci_6600.c +++ b/sys/arch/alpha/pci/pci_6600.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_6600.c,v 1.18 2009/08/22 02:54:50 mk Exp $ */ +/* $OpenBSD: pci_6600.c,v 1.19 2009/09/30 20:16:30 miod Exp $ */ /* $NetBSD: pci_6600.c,v 1.5 2000/06/06 00:50:15 thorpej Exp $ */ /*- @@ -73,7 +73,6 @@ #define DEC_6600_LINE_IS_ISA(line) ((line) >= 0xe0 && (line) <= 0xef) #define DEC_6600_LINE_ISA_IRQ(line) ((line) & 0x0f) -static char *irqtype = "6600 irq"; static struct tsp_config *sioprimary; void dec_6600_intr_disestablish(void *, void *); @@ -268,7 +267,7 @@ dec_6600_intr_disestablish(acv, cookie) s = splhigh(); - alpha_shared_intr_disestablish(dec_6600_pci_intr, cookie, irqtype); + alpha_shared_intr_disestablish(dec_6600_pci_intr, cookie); if (alpha_shared_intr_isactive(dec_6600_pci_intr, irq) == 0) { dec_6600_intr_disable(irq); alpha_shared_intr_set_dfltsharetype(dec_6600_pci_intr, irq, @@ -292,8 +291,7 @@ dec_6600_iointr(arg, vec) panic("iointr: irq %d is too high", irq); if (!alpha_shared_intr_dispatch(dec_6600_pci_intr, irq)) { - alpha_shared_intr_stray(dec_6600_pci_intr, irq, - irqtype); + alpha_shared_intr_stray(dec_6600_pci_intr, irq, "6600 irq"); if (ALPHA_SHARED_INTR_DISABLE(dec_6600_pci_intr, irq)) dec_6600_intr_disable(irq); } else diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c index 89b7b325722..89e4a1b9d68 100644 --- a/sys/arch/alpha/pci/pci_eb164.c +++ b/sys/arch/alpha/pci/pci_eb164.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_eb164.c,v 1.23 2009/08/22 02:54:50 mk Exp $ */ +/* $OpenBSD: pci_eb164.c,v 1.24 2009/09/30 20:16:30 miod Exp $ */ /* $NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $ */ /*- @@ -293,8 +293,7 @@ dec_eb164_intr_disestablish(ccv, cookie) s = splhigh(); - alpha_shared_intr_disestablish(eb164_pci_intr, cookie, - "eb164 irq"); + alpha_shared_intr_disestablish(eb164_pci_intr, cookie); if (alpha_shared_intr_isactive(eb164_pci_intr, irq) == 0) { eb164_intr_disable(irq); alpha_shared_intr_set_dfltsharetype(eb164_pci_intr, irq, diff --git a/sys/arch/alpha/pci/pci_eb64plus.c b/sys/arch/alpha/pci/pci_eb64plus.c index a6f5ec46d19..1da819d8863 100644 --- a/sys/arch/alpha/pci/pci_eb64plus.c +++ b/sys/arch/alpha/pci/pci_eb64plus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_eb64plus.c,v 1.12 2009/08/22 02:54:50 mk Exp $ */ +/* $OpenBSD: pci_eb64plus.c,v 1.13 2009/09/30 20:16:30 miod Exp $ */ /* $NetBSD: pci_eb64plus.c,v 1.10 2001/07/27 00:25:20 thorpej Exp $ */ /*- @@ -225,8 +225,7 @@ dec_eb64plus_intr_disestablish(acv, cookie) s = splhigh(); - alpha_shared_intr_disestablish(eb64plus_pci_intr, cookie, - "eb64+ irq"); + alpha_shared_intr_disestablish(eb64plus_pci_intr, cookie); if (alpha_shared_intr_isactive(eb64plus_pci_intr, irq) == 0) { eb64plus_intr_disable(irq); alpha_shared_intr_set_dfltsharetype(eb64plus_pci_intr, irq, diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c index e087913cf43..bddb3cebcc7 100644 --- a/sys/arch/alpha/pci/pci_kn20aa.c +++ b/sys/arch/alpha/pci/pci_kn20aa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_kn20aa.c,v 1.24 2009/08/22 02:54:50 mk Exp $ */ +/* $OpenBSD: pci_kn20aa.c,v 1.25 2009/09/30 20:16:31 miod Exp $ */ /* $NetBSD: pci_kn20aa.c,v 1.21 1996/11/17 02:05:27 cgd Exp $ */ /* @@ -224,8 +224,7 @@ dec_kn20aa_intr_disestablish(ccv, cookie) s = splhigh(); - alpha_shared_intr_disestablish(kn20aa_pci_intr, cookie, - "kn20aa irq"); + alpha_shared_intr_disestablish(kn20aa_pci_intr, cookie); if (alpha_shared_intr_isactive(kn20aa_pci_intr, irq) == 0) { kn20aa_disable_intr(irq); alpha_shared_intr_set_dfltsharetype(kn20aa_pci_intr, irq, diff --git a/sys/arch/alpha/pci/sio_pic.c b/sys/arch/alpha/pci/sio_pic.c index 03f4ee4c732..8b65a4638b3 100644 --- a/sys/arch/alpha/pci/sio_pic.c +++ b/sys/arch/alpha/pci/sio_pic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sio_pic.c,v 1.30 2009/08/22 02:54:50 mk Exp $ */ +/* $OpenBSD: sio_pic.c,v 1.31 2009/09/30 20:16:31 miod Exp $ */ /* $NetBSD: sio_pic.c,v 1.28 2000/06/06 03:10:13 thorpej Exp $ */ /*- @@ -478,7 +478,7 @@ sio_intr_disestablish(v, cookie) s = splhigh(); /* Remove it from the link. */ - alpha_shared_intr_disestablish(sio_intr, cookie, "isa irq"); + alpha_shared_intr_disestablish(sio_intr, cookie); /* * Decide if we should disable the interrupt. We must ensure -- cgit v1.2.3