One function pointer per pic function is enough.

4 files changed, 6 insertions, 35 deletions

diff --git a/sys/arch/macppc/dev/macintr.c b/sys/arch/macppc/dev/macintr.c
index 443e70a57f2..69318aa64cc 100644
--- a/sys/arch/macppc/dev/macintr.c
+++ b/sys/arch/macppc/dev/macintr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macintr.c,v 1.50 2015/01/04 13:01:42 mpi Exp $	*/
+/*	$OpenBSD: macintr.c,v 1.51 2015/04/02 11:12:24 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2008 Dale Rahn <drahn@openbsd.org>
@@ -127,8 +127,6 @@ int macintr_prog_button (void *arg);
 
 intr_establish_t macintr_establish;
 intr_disestablish_t macintr_disestablish;
-extern intr_establish_t *mac_intr_establish_func;
-extern intr_disestablish_t *mac_intr_disestablish_func;
 
 ppc_splraise_t macintr_splraise;
 ppc_spllower_t macintr_spllower;
@@ -201,8 +199,6 @@ macintr_attach(struct device *parent, struct device *self, void *aux)
 	install_extint(mac_ext_intr);
 	intr_establish_func  = macintr_establish;
 	intr_disestablish_func  = macintr_disestablish;
-	mac_intr_establish_func  = macintr_establish;
-	mac_intr_disestablish_func  = macintr_disestablish;
 
 	ppc_intr_func.raise = macintr_splraise;
 	ppc_intr_func.lower = macintr_spllower;
diff --git a/sys/arch/macppc/dev/openpic.c b/sys/arch/macppc/dev/openpic.c
index 520496d2138..c3b55e0c226 100644
--- a/sys/arch/macppc/dev/openpic.c
+++ b/sys/arch/macppc/dev/openpic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: openpic.c,v 1.77 2015/04/02 10:58:20 mpi Exp $	*/
+/*	$OpenBSD: openpic.c,v 1.78 2015/04/02 11:12:24 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2008 Dale Rahn <drahn@openbsd.org>
@@ -209,8 +209,6 @@ openpic_attach(struct device *parent, struct device  *self, void *aux)
 
 	intr_establish_func  = openpic_intr_establish;
 	intr_disestablish_func  = openpic_intr_disestablish;
-	mac_intr_establish_func  = openpic_intr_establish;
-	mac_intr_disestablish_func  = openpic_intr_disestablish;
 #ifdef MULTIPROCESSOR
 	intr_send_ipi_func = openpic_send_ipi;
 #endif
diff --git a/sys/arch/macppc/include/autoconf.h b/sys/arch/macppc/include/autoconf.h
index 222a50f11d2..a0266e137c9 100644
--- a/sys/arch/macppc/include/autoconf.h
+++ b/sys/arch/macppc/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.11 2014/07/02 15:34:43 tobiasu Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.12 2015/04/02 11:12:24 mpi Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -69,8 +69,6 @@ intr_establish_t mac_intr_establish;
 intr_disestablish_t mac_intr_disestablish;
 extern intr_establish_t *intr_establish_func;
 extern intr_disestablish_t *intr_disestablish_func;
-extern intr_establish_t *mac_intr_establish_func;
-extern intr_disestablish_t *mac_intr_disestablish_func;
 extern intr_send_ipi_t *intr_send_ipi_func;
 
 
diff --git a/sys/arch/macppc/pci/macobio.c b/sys/arch/macppc/pci/macobio.c
index daaac4da7c9..40f9cf3b6dc 100644
--- a/sys/arch/macppc/pci/macobio.c
+++ b/sys/arch/macppc/pci/macobio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macobio.c,v 1.20 2012/12/10 16:32:13 mpi Exp $	*/
+/*	$OpenBSD: macobio.c,v 1.21 2015/04/02 11:12:24 mpi Exp $	*/
 /*	$NetBSD: obio.c,v 1.6 1999/05/01 10:36:08 tsubai Exp $	*/
 
 /*-
@@ -52,10 +52,6 @@ int macobio_match(struct device *, void *, void *);
 int macobio_print(void *, const char *);
 void macobio_modem_power(int enable);
 
-void *undef_mac_establish(void * lcv, int irq, int type, int level,
-    int (*ih_fun)(void *), void *ih_arg, const char *name);
-void mac_intr_disestab(void *lcp, void *arg);
-
 struct macobio_softc {
 	struct device sc_dev;
 	int sc_node;
@@ -229,33 +225,16 @@ macobio_print(void *aux, const char *macobio)
 }
 
 void *
-undef_mac_establish(void * lcv, int irq, int type, int level,
-    int (*ih_fun)(void *), void *ih_arg, const char *name)
-{
-	printf("mac_intr_establish called, not yet inited\n");
-	return 0;
-}
-
-void
-mac_intr_disestab(void *lcp, void *arg)
-{
-	printf("mac_intr_disestablish called, not yet inited\n");
-}
-
-intr_establish_t *mac_intr_establish_func = undef_mac_establish;
-intr_disestablish_t *mac_intr_disestablish_func = mac_intr_disestab;
-
-void *
 mac_intr_establish(void * lcv, int irq, int type, int level,
     int (*ih_fun)(void *), void *ih_arg, const char *name)
 {
-	return (*mac_intr_establish_func)(lcv, irq, type, level, ih_fun,
+	return (*intr_establish_func)(lcv, irq, type, level, ih_fun,
 	    ih_arg, name);
 }
 void
 mac_intr_disestablish(void *lcp, void *arg)
 {
-	(*mac_intr_disestablish_func)(lcp, arg);
+	(*intr_disestablish_func)(lcp, arg);
 }
 
 void