Retire the global interrupt establish and disestablish API. It has been

of good use for supporting multiple SoCs with each their own interrupt
controllers, but as of now we have replaced it wit the FDT-enabled API.

ok kettenis@

4 files changed, 7 insertions, 52 deletions

diff --git a/sys/arch/arm64/arm64/intr.c b/sys/arch/arm64/arm64/intr.c
index 9503ede7e87..4eadea2bc73 100644
--- a/sys/arch/arm64/arm64/intr.c
+++ b/sys/arch/arm64/arm64/intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.c,v 1.3 2017/02/24 17:10:59 patrick Exp $ */
+/* $OpenBSD: intr.c,v 1.4 2017/02/24 17:16:41 patrick Exp $ */
 /*
  * Copyright (c) 2011 Dale Rahn <drahn@openbsd.org>
  *
@@ -37,9 +37,6 @@ int arm_dflt_splraise(int);
 int arm_dflt_spllower(int);
 void arm_dflt_splx(int);
 void arm_dflt_setipl(int);
-void *arm_dflt_intr_establish(int irqno, int level, int (*func)(void *),
-    void *cookie, char *name);
-void arm_dflt_intr_disestablish(void *cookie);
 
 void arm_dflt_intr(void *);
 void arm_cpu_intr(void *);
@@ -51,9 +48,7 @@ struct arm_intr_func arm_intr_func = {
 	arm_dflt_splraise,
 	arm_dflt_spllower,
 	arm_dflt_splx,
-	arm_dflt_setipl,
-	arm_dflt_intr_establish,
-	arm_dflt_intr_disestablish
+	arm_dflt_setipl
 };
 
 void (*arm_intr_dispatch)(void *) = arm_dflt_intr;
@@ -70,17 +65,6 @@ arm_dflt_intr(void *frame)
 	panic("arm_dflt_intr() called");
 }
 
-
-void *arm_intr_establish(int irqno, int level, int (*func)(void *),
-    void *cookie, char *name)
-{
-	return arm_intr_func.intr_establish(irqno, level, func, cookie, name);
-}
-void arm_intr_disestablish(void *cookie)
-{
-	arm_intr_func.intr_disestablish(cookie);
-}
-
 /*
  * Find the interrupt parent by walking up the tree.
  */
@@ -480,17 +464,6 @@ arm_dflt_setipl(int newcpl)
 	ci->ci_cpl = newcpl;
 }
 
-void *arm_dflt_intr_establish(int irqno, int level, int (*func)(void *),
-    void *cookie, char *name)
-{
-	panic("arm_dflt_intr_establish called");
-}
-
-void arm_dflt_intr_disestablish(void *cookie)
-{
-	panic("arm_dflt_intr_disestablish called");
-}
-
 void
 arm_do_pending_intr(int pcpl)
 {
@@ -523,17 +496,12 @@ arm_do_pending_intr(int pcpl)
 
 void arm_set_intr_handler(int (*raise)(int), int (*lower)(int),
     void (*x)(int), void (*setipl)(int),
-	void *(*intr_establish)(int irqno, int level, int (*func)(void *),
-	    void *cookie, char *name),
-	void (*intr_disestablish)(void *cookie),
 	void (*intr_handle)(void *))
 {
 	arm_intr_func.raise		= raise;
 	arm_intr_func.lower		= lower;
 	arm_intr_func.x			= x;
 	arm_intr_func.setipl		= setipl;
-	arm_intr_func.intr_establish	= intr_establish;
-	arm_intr_func.intr_disestablish	= intr_disestablish;
 	arm_intr_dispatch		= intr_handle;
 }
 
diff --git a/sys/arch/arm64/dev/ampintc.c b/sys/arch/arm64/dev/ampintc.c
index aa15de5798b..66ba3558dc7 100644
--- a/sys/arch/arm64/dev/ampintc.c
+++ b/sys/arch/arm64/dev/ampintc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ampintc.c,v 1.4 2017/02/07 21:23:25 patrick Exp $ */
+/* $OpenBSD: ampintc.c,v 1.5 2017/02/24 17:16:41 patrick Exp $ */
 /*
  * Copyright (c) 2007,2009,2011 Dale Rahn <drahn@openbsd.org>
  *
@@ -270,8 +270,7 @@ ampintc_attach(struct device *parent, struct device *self, void *aux)
 
 	/* insert self as interrupt handler */
 	arm_set_intr_handler(ampintc_splraise, ampintc_spllower, ampintc_splx,
-	    ampintc_setipl, ampintc_intr_establish_ext,
-	    ampintc_intr_disestablish, ampintc_irq_handler);
+	    ampintc_setipl, ampintc_irq_handler);
 
 	/* enable interrupts */
 	bus_space_write_4(sc->sc_iot, sc->sc_d_ioh, ICD_DCR, 3);
diff --git a/sys/arch/arm64/dev/bcm2836_intr.c b/sys/arch/arm64/dev/bcm2836_intr.c
index 16d6e1daa50..8e374412e99 100644
--- a/sys/arch/arm64/dev/bcm2836_intr.c
+++ b/sys/arch/arm64/dev/bcm2836_intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bcm2836_intr.c,v 1.1 2017/01/23 08:05:47 kettenis Exp $ */
+/* $OpenBSD: bcm2836_intr.c,v 1.2 2017/02/24 17:16:41 patrick Exp $ */
 /*
  * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
  * Copyright (c) 2015 Patrick Wildt <patrick@blueri.se>
@@ -202,9 +202,7 @@ bcm_intc_attach(struct device *parent, struct device *self, void *aux)
 
 	/* insert self as interrupt handler */
 	arm_set_intr_handler(bcm_intc_splraise, bcm_intc_spllower,
-	    bcm_intc_splx, bcm_intc_setipl,
-	    bcm_intc_intr_establish, bcm_intc_intr_disestablish,
-	    bcm_intc_irq_handler);
+	    bcm_intc_splx, bcm_intc_setipl, bcm_intc_irq_handler);
 
 	sc->sc_intc.ic_node = faa->fa_node;
 	sc->sc_intc.ic_cookie = sc;
diff --git a/sys/arch/arm64/include/intr.h b/sys/arch/arm64/include/intr.h
index f4c91ef4231..a4f2a65a463 100644
--- a/sys/arch/arm64/include/intr.h
+++ b/sys/arch/arm64/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.2 2017/02/24 17:10:59 patrick Exp $ */
+/*	$OpenBSD: intr.h,v 1.3 2017/02/24 17:16:41 patrick Exp $ */
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -85,9 +85,6 @@ void	 splx(int);
 void	 arm_do_pending_intr(int);
 void	 arm_set_intr_handler(int (*raise)(int), int (*lower)(int),
     void (*x)(int), void (*setipl)(int),
-    void *(*intr_establish)(int irqno, int level, int (*func)(void *),
-        void *cookie, char *name),
-    void (*intr_disestablish)(void *cookie),
     void (*intr_handle)(void *));
 
 struct arm_intr_func {
@@ -95,9 +92,6 @@ struct arm_intr_func {
 	int (*lower)(int);
 	void (*x)(int);
 	void (*setipl)(int);
-	void *(*intr_establish)(int irqno, int level, int (*func)(void *),
-	    void *cookie, char *name);
-	void (*intr_disestablish)(void *cookie);
 };
 
 extern struct arm_intr_func arm_intr_func;
@@ -131,10 +125,6 @@ extern uint32_t arm_smask[NIPL];
 
 #include <machine/softintr.h>
 
-void	*arm_intr_establish(int irqno, int level, int (*func)(void *),
-    void *cookie, char *name);
-void	 arm_intr_disestablish(void *cookie);
-
 /* XXX - this is probably the wrong location for this */
 void arm_clock_register(void (*)(void), void (*)(u_int), void (*)(int),
     void (*)(void));