? arch/arm64/compile/GENERIC/obj ? arch/armv7/compile/GENERIC/obj Index: arch/arm/include/fdt.h =================================================================== RCS file: /cvs/src/sys/arch/arm/include/fdt.h,v retrieving revision 1.4 diff -u -p -r1.4 fdt.h --- arch/arm/include/fdt.h 27 Jul 2016 11:45:02 -0000 1.4 +++ arch/arm/include/fdt.h 25 Jul 2017 03:28:38 -0000 @@ -34,4 +34,7 @@ struct fdt_attach_args { int fa_scells; }; +void *fdt_intr_establish(int, int, int (*)(void *), void *, const char *); +void fdt_intr_disestablish(void *); + #endif /* __ARM_FDT_H__ */ Index: arch/arm64/arm64/intr.c =================================================================== RCS file: /cvs/src/sys/arch/arm64/arm64/intr.c,v retrieving revision 1.7 diff -u -p -r1.7 intr.c --- arch/arm64/arm64/intr.c 9 Mar 2017 14:23:59 -0000 1.7 +++ arch/arm64/arm64/intr.c 25 Jul 2017 03:28:38 -0000 @@ -31,7 +31,7 @@ uint32_t arm_intr_get_parent(int); uint32_t arm_intr_msi_get_parent(int); void *arm_intr_prereg_establish_fdt(void *, int *, int, int (*)(void *), - void *, char *); + void *, const char *); void arm_intr_prereg_disestablish_fdt(void *); int arm_dflt_splraise(int); @@ -118,7 +118,7 @@ struct intr_prereg { int ip_level; int (*ip_func)(void *); void *ip_arg; - char *ip_name; + const char *ip_name; struct interrupt_controller *ip_ic; void *ip_ih; @@ -129,7 +129,7 @@ LIST_HEAD(, intr_prereg) prereg_interrup void * arm_intr_prereg_establish_fdt(void *cookie, int *cell, int level, - int (*func)(void *), void *arg, char *name) + int (*func)(void *), void *arg, const char *name) { struct interrupt_controller *ic = cookie; struct intr_prereg *ip; @@ -228,15 +228,15 @@ struct arm_intr_handle { }; void * -arm_intr_establish_fdt(int node, int level, int (*func)(void *), - void *cookie, char *name) +fdt_intr_establish(int node, int level, int (*func)(void *), + void *cookie, const char *name) { return arm_intr_establish_fdt_idx(node, 0, level, func, cookie, name); } void * arm_intr_establish_fdt_idx(int node, int idx, int level, int (*func)(void *), - void *cookie, char *name) + void *cookie, const char *name) { struct interrupt_controller *ic; int i, len, ncells, extended = 1; @@ -311,7 +311,7 @@ arm_intr_establish_fdt_idx(int node, int void * arm_intr_establish_fdt_imap(int node, int *reg, int nreg, int acells, - int level, int (*func)(void *), void *cookie, char *name) + int level, int (*func)(void *), void *cookie, const char *name) { struct interrupt_controller *ic; struct arm_intr_handle *ih; @@ -380,7 +380,7 @@ arm_intr_establish_fdt_imap(int node, in void * arm_intr_establish_fdt_msi(int node, uint64_t *addr, uint64_t *data, - int level, int (*func)(void *), void *cookie, char *name) + int level, int (*func)(void *), void *cookie, const char *name) { struct interrupt_controller *ic; struct arm_intr_handle *ih; @@ -407,7 +407,7 @@ arm_intr_establish_fdt_msi(int node, uin } void -arm_intr_disestablish_fdt(void *cookie) +fdt_intr_disestablish(void *cookie) { struct arm_intr_handle *ih = cookie; struct interrupt_controller *ic = ih->ih_ic; Index: arch/arm64/dev/agintc.c =================================================================== RCS file: /cvs/src/sys/arch/arm64/dev/agintc.c,v retrieving revision 1.4 diff -u -p -r1.4 agintc.c --- arch/arm64/dev/agintc.c 30 Apr 2017 21:52:40 -0000 1.4 +++ arch/arm64/dev/agintc.c 25 Jul 2017 03:28:38 -0000 @@ -140,7 +140,7 @@ struct intrhand { int ih_ipl; /* IPL_* */ int ih_irq; /* IRQ number */ struct evcount ih_count; - char *ih_name; + const char *ih_name; }; struct intrq { @@ -160,9 +160,9 @@ void agintc_setipl(int); void agintc_calc_mask(void); void agintc_calc_irq(struct agintc_softc *sc, int irq); void *agintc_intr_establish(int, int, int (*)(void *), void *, - char *); + const char *); void *agintc_intr_establish_fdt(void *cookie, int *cell, int level, - int (*func)(void *), void *arg, char *name); + int (*func)(void *), void *arg, const char *name); void agintc_intr_disestablish(void *); void agintc_irq_handler(void *); uint32_t agintc_iack(void); @@ -657,7 +657,7 @@ agintc_irq_handler(void *frame) void * agintc_intr_establish_fdt(void *cookie, int *cell, int level, - int (*func)(void *), void *arg, char *name) + int (*func)(void *), void *arg, const char *name) { struct agintc_softc *sc = agintc_sc; int irq; @@ -678,7 +678,7 @@ agintc_intr_establish_fdt(void *cookie, void * agintc_intr_establish(int irqno, int level, int (*func)(void *), - void *arg, char *name) + void *arg, const char *name) { struct agintc_softc *sc = agintc_sc; struct intrhand *ih; Index: arch/arm64/dev/ampintc.c =================================================================== RCS file: /cvs/src/sys/arch/arm64/dev/ampintc.c,v retrieving revision 1.9 diff -u -p -r1.9 ampintc.c --- arch/arm64/dev/ampintc.c 30 Apr 2017 16:45:45 -0000 1.9 +++ arch/arm64/dev/ampintc.c 25 Jul 2017 03:28:38 -0000 @@ -152,7 +152,7 @@ struct intrhand { int ih_ipl; /* IPL_* */ int ih_irq; /* IRQ number */ struct evcount ih_count; - char *ih_name; + const char *ih_name; }; struct intrq { @@ -171,11 +171,11 @@ int ampintc_splraise(int); void ampintc_setipl(int); void ampintc_calc_mask(void); void *ampintc_intr_establish(int, int, int, int (*)(void *), - void *, char *); + void *, const char *); void *ampintc_intr_establish_ext(int, int, int, int (*)(void *), - void *, char *); + void *, const char *); void *ampintc_intr_establish_fdt(void *, int *, int, - int (*)(void *), void *, char *); + int (*)(void *), void *, const char *); void ampintc_intr_disestablish(void *); void ampintc_irq_handler(void *); const char *ampintc_intr_string(void *); @@ -552,14 +552,14 @@ ampintc_irq_handler(void *frame) void * ampintc_intr_establish_ext(int irqno, int type, int level, int (*func)(void *), - void *arg, char *name) + void *arg, const char *name) { return ampintc_intr_establish(irqno+32, type, level, func, arg, name); } void * ampintc_intr_establish_fdt(void *cookie, int *cell, int level, - int (*func)(void *), void *arg, char *name) + int (*func)(void *), void *arg, const char *name) { struct ampintc_softc *sc = (struct ampintc_softc *)cookie; int irq; @@ -587,7 +587,7 @@ ampintc_intr_establish_fdt(void *cookie, void * ampintc_intr_establish(int irqno, int type, int level, int (*func)(void *), - void *arg, char *name) + void *arg, const char *name) { struct ampintc_softc *sc = ampintc; struct intrhand *ih; @@ -668,7 +668,7 @@ ampintc_intr_string(void *cookie) int ampintc_msi_match(struct device *, void *, void *); void ampintc_msi_attach(struct device *, struct device *, void *); void *ampintc_intr_establish_msi(void *, uint64_t *, uint64_t *, - int , int (*)(void *), void *, char *); + int , int (*)(void *), void *, const char *); void ampintc_intr_disestablish_msi(void *); struct ampintc_msi_softc { @@ -739,7 +739,7 @@ ampintc_msi_attach(struct device *parent void * ampintc_intr_establish_msi(void *self, uint64_t *addr, uint64_t *data, - int level, int (*func)(void *), void *arg, char *name) + int level, int (*func)(void *), void *arg, const char *name) { struct ampintc_msi_softc *sc = (struct ampintc_msi_softc *)self; void *cookie; Index: arch/arm64/dev/bcm2836_intr.c =================================================================== RCS file: /cvs/src/sys/arch/arm64/dev/bcm2836_intr.c,v retrieving revision 1.3 diff -u -p -r1.3 bcm2836_intr.c --- arch/arm64/dev/bcm2836_intr.c 30 Apr 2017 16:45:45 -0000 1.3 +++ arch/arm64/dev/bcm2836_intr.c 25 Jul 2017 03:28:38 -0000 @@ -81,7 +81,7 @@ struct intrhand { int ih_ipl; /* IPL_* */ int ih_irq; /* IRQ number */ struct evcount ih_count; /* interrupt counter */ - char *ih_name; /* device name */ + const char *ih_name; /* device name */ }; struct intrsource { @@ -109,11 +109,11 @@ int bcm_intc_splraise(int new); void bcm_intc_setipl(int new); void bcm_intc_calc_mask(void); void *bcm_intc_intr_establish(int, int, int (*)(void *), - void *, char *); + void *, const char *); void *bcm_intc_intr_establish_fdt(void *, int *, int, int (*)(void *), - void *, char *); + void *, const char *); void *l1_intc_intr_establish_fdt(void *, int *, int, int (*)(void *), - void *, char *); + void *, const char *); void bcm_intc_intr_disestablish(void *); void bcm_intc_irq_handler(void *); @@ -474,7 +474,7 @@ bcm_intc_irq_handler(void *frame) void * bcm_intc_intr_establish_fdt(void *cookie, int *cell, int level, - int (*func)(void *), void *arg, char *name) + int (*func)(void *), void *arg, const char *name) { struct bcm_intc_softc *sc = (struct bcm_intc_softc *)cookie; int irq; @@ -496,7 +496,7 @@ bcm_intc_intr_establish_fdt(void *cookie void * l1_intc_intr_establish_fdt(void *cookie, int *cell, int level, - int (*func)(void *), void *arg, char *name) + int (*func)(void *), void *arg, const char *name) { int irq; @@ -506,7 +506,7 @@ l1_intc_intr_establish_fdt(void *cookie, void * bcm_intc_intr_establish(int irqno, int level, int (*func)(void *), - void *arg, char *name) + void *arg, const char *name) { struct bcm_intc_softc *sc = bcm_intc; struct intrhand *ih; Index: arch/arm64/dev/com_fdt.c =================================================================== RCS file: /cvs/src/sys/arch/arm64/dev/com_fdt.c,v retrieving revision 1.2 diff -u -p -r1.2 com_fdt.c --- arch/arm64/dev/com_fdt.c 20 Jan 2017 08:03:21 -0000 1.2 +++ arch/arm64/dev/com_fdt.c 25 Jul 2017 03:28:38 -0000 @@ -160,7 +160,7 @@ com_fdt_attach(struct device *parent, st com_attach_subr(&sc->sc); - arm_intr_establish_fdt(faa->fa_node, IPL_TTY, intr, + fdt_intr_establish(faa->fa_node, IPL_TTY, intr, sc, sc->sc.sc_dev.dv_xname); } Index: arch/arm64/dev/pluart.c =================================================================== RCS file: /cvs/src/sys/arch/arm64/dev/pluart.c,v retrieving revision 1.5 diff -u -p -r1.5 pluart.c --- arch/arm64/dev/pluart.c 30 Apr 2017 16:45:45 -0000 1.5 +++ arch/arm64/dev/pluart.c 25 Jul 2017 03:28:38 -0000 @@ -239,7 +239,7 @@ pluartattach(struct device *parent, stru return; } - sc->sc_irq = arm_intr_establish_fdt(faa->fa_node, IPL_TTY, pluart_intr, + sc->sc_irq = fdt_intr_establish(faa->fa_node, IPL_TTY, pluart_intr, sc, sc->sc_dev.dv_xname); sc->sc_iot = faa->fa_iot; Index: arch/arm64/include/fdt.h =================================================================== RCS file: /cvs/src/sys/arch/arm64/include/fdt.h,v retrieving revision 1.1 diff -u -p -r1.1 fdt.h --- arch/arm64/include/fdt.h 17 Dec 2016 23:38:33 -0000 1.1 +++ arch/arm64/include/fdt.h 25 Jul 2017 03:28:38 -0000 @@ -34,4 +34,7 @@ struct fdt_attach_args { int fa_scells; }; +void *fdt_intr_establish(int, int, int (*)(void *), void *, const char *); +void fdt_intr_disestablish(void *); + #endif /* __ARM_FDT_H__ */ Index: arch/arm64/include/intr.h =================================================================== RCS file: /cvs/src/sys/arch/arm64/include/intr.h,v retrieving revision 1.6 diff -u -p -r1.6 intr.h --- arch/arm64/include/intr.h 9 Mar 2017 14:23:59 -0000 1.6 +++ arch/arm64/include/intr.h 25 Jul 2017 03:28:38 -0000 @@ -135,9 +135,9 @@ struct interrupt_controller { int ic_node; void *ic_cookie; void *(*ic_establish)(void *, int *, int, int (*)(void *), - void *, char *); + void *, const char *); void *(*ic_establish_msi)(void *, uint64_t *, uint64_t *, int, - int (*)(void *), void *, char *); + int (*)(void *), void *, const char *); void (*ic_disestablish)(void *); void (*ic_route)(void *, int, struct cpu_info *); @@ -147,21 +147,17 @@ struct interrupt_controller { }; void arm_intr_init_fdt(void); -void arm_intr_register_fdt(struct interrupt_controller *); -void *arm_intr_establish_fdt(int, int, int (*)(void *), - void *, char *); +void arm_intr_register_fdt(struct interrupt_controller *); void *arm_intr_establish_fdt_idx(int, int, int, int (*)(void *), - void *, char *); + void *, const char *); void *arm_intr_establish_fdt_imap(int, int *, int, int, int, int (*)(void *), - void *, char *); + void *, const char *); void *arm_intr_establish_fdt_msi(int, uint64_t *, uint64_t *, int , - int (*)(void *), void *, char *); -void arm_intr_disestablish_fdt(void *); + int (*)(void *), void *, const char *); void arm_intr_route(void *, int, struct cpu_info *); void *arm_intr_parent_establish_fdt(void *, int *, int, int (*)(void *), void *, char *); -void arm_intr_parent_disestablish_fdt(void *); #ifdef DIAGNOSTIC /* Index: arch/armv7/armv7/intr.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/armv7/intr.c,v retrieving revision 1.11 diff -u -p -r1.11 intr.c --- arch/armv7/armv7/intr.c 9 Mar 2017 15:36:52 -0000 1.11 +++ arch/armv7/armv7/intr.c 25 Jul 2017 03:28:38 -0000 @@ -31,7 +31,7 @@ uint32_t arm_intr_get_parent(int); void *arm_intr_prereg_establish_fdt(void *, int *, int, int (*)(void *), - void *, char *); + void *, const char *); void arm_intr_prereg_disestablish_fdt(void *); int arm_dflt_splraise(int); @@ -39,7 +39,7 @@ 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 *cookie, const char *name); void arm_dflt_intr_disestablish(void *cookie); const char *arm_dflt_intr_string(void *cookie); @@ -74,16 +74,21 @@ arm_dflt_intr(void *frame) } -void *arm_intr_establish(int irqno, int level, int (*func)(void *), - void *cookie, char *name) +void * +arm_intr_establish(int irqno, int level, int (*func)(void *), + void *cookie, const char *name) { return arm_intr_func.intr_establish(irqno, level, func, cookie, name); } -void arm_intr_disestablish(void *cookie) + +void +arm_intr_disestablish(void *cookie) { arm_intr_func.intr_disestablish(cookie); } -const char *arm_intr_string(void *cookie) + +const char * +arm_intr_string(void *cookie) { return arm_intr_func.intr_string(cookie); } @@ -127,7 +132,7 @@ struct intr_prereg { int ip_level; int (*ip_func)(void *); void *ip_arg; - char *ip_name; + const char *ip_name; struct interrupt_controller *ip_ic; void *ip_ih; @@ -138,7 +143,7 @@ LIST_HEAD(, intr_prereg) prereg_interrup void * arm_intr_prereg_establish_fdt(void *cookie, int *cell, int level, - int (*func)(void *), void *arg, char *name) + int (*func)(void *), void *arg, const char *name) { struct interrupt_controller *ic = cookie; struct intr_prereg *ip; @@ -237,15 +242,16 @@ struct arm_intr_handle { }; void * -arm_intr_establish_fdt(int node, int level, int (*func)(void *), - void *cookie, char *name) +fdt_intr_establish(const struct fdt_attach_args *fa, int level, + int (*func)(void *), void *cookie, const char *name) { - return arm_intr_establish_fdt_idx(node, 0, level, func, cookie, name); + return arm_intr_establish_fdt_idx(fa->fa_node, 0, level, + func, cookie, name); } void * arm_intr_establish_fdt_idx(int node, int idx, int level, int (*func)(void *), - void *cookie, char *name) + void *cookie, const char *name) { struct interrupt_controller *ic; int i, len, ncells, extended = 1; @@ -319,7 +325,7 @@ arm_intr_establish_fdt_idx(int node, int } void -arm_intr_disestablish_fdt(void *cookie) +fdt_intr_disestablish(void *cookie) { struct arm_intr_handle *ih = cookie; struct interrupt_controller *ic = ih->ih_ic; @@ -335,7 +341,7 @@ arm_intr_disestablish_fdt(void *cookie) */ void * arm_intr_parent_establish_fdt(void *cookie, int *cell, int level, - int (*func)(void *), void *arg, char *name) + int (*func)(void *), void *arg, const char *name) { struct interrupt_controller *ic = cookie; struct arm_intr_handle *ih; @@ -428,13 +434,15 @@ 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) +void * +arm_dflt_intr_establish(int irqno, int level, int (*func)(void *), + void *cookie, const char *name) { panic("arm_dflt_intr_establish called"); } -void arm_dflt_intr_disestablish(void *cookie) +void +arm_dflt_intr_disestablish(void *cookie) { panic("arm_dflt_intr_disestablish called"); } @@ -495,7 +503,7 @@ 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 *cookie, const char *name), void (*intr_disestablish)(void *cookie), const char *(intr_string)(void *cookie), void (*intr_handle)(void *)) Index: arch/armv7/broadcom/bcm2836_intr.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/broadcom/bcm2836_intr.c,v retrieving revision 1.3 diff -u -p -r1.3 bcm2836_intr.c --- arch/armv7/broadcom/bcm2836_intr.c 30 Apr 2017 16:45:45 -0000 1.3 +++ arch/armv7/broadcom/bcm2836_intr.c 25 Jul 2017 03:28:38 -0000 @@ -83,7 +83,7 @@ struct intrhand { int ih_ipl; /* IPL_* */ int ih_irq; /* IRQ number */ struct evcount ih_count; /* interrupt counter */ - char *ih_name; /* device name */ + const char *ih_name; /* device name */ }; struct intrsource { @@ -111,11 +111,11 @@ int bcm_intc_splraise(int new); void bcm_intc_setipl(int new); void bcm_intc_calc_mask(void); void *bcm_intc_intr_establish(int, int, int (*)(void *), - void *, char *); + void *, const char *); void *bcm_intc_intr_establish_fdt(void *, int *, int, int (*)(void *), - void *, char *); + void *, const char *); void *l1_intc_intr_establish_fdt(void *, int *, int, int (*)(void *), - void *, char *); + void *, const char *); void bcm_intc_intr_disestablish(void *); const char *bcm_intc_intr_string(void *); void bcm_intc_irq_handler(void *); @@ -479,7 +479,7 @@ bcm_intc_irq_handler(void *frame) void * bcm_intc_intr_establish_fdt(void *cookie, int *cell, int level, - int (*func)(void *), void *arg, char *name) + int (*func)(void *), void *arg, const char *name) { struct bcm_intc_softc *sc = (struct bcm_intc_softc *)cookie; int irq; @@ -501,7 +501,7 @@ bcm_intc_intr_establish_fdt(void *cookie void * l1_intc_intr_establish_fdt(void *cookie, int *cell, int level, - int (*func)(void *), void *arg, char *name) + int (*func)(void *), void *arg, const char *name) { int irq; @@ -511,7 +511,7 @@ l1_intc_intr_establish_fdt(void *cookie, void * bcm_intc_intr_establish(int irqno, int level, int (*func)(void *), - void *arg, char *name) + void *arg, const char *name) { struct bcm_intc_softc *sc = bcm_intc; struct intrhand *ih; Index: arch/armv7/dev/com_fdt.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/dev/com_fdt.c,v retrieving revision 1.9 diff -u -p -r1.9 com_fdt.c --- arch/armv7/dev/com_fdt.c 22 Aug 2016 09:37:27 -0000 1.9 +++ arch/armv7/dev/com_fdt.c 25 Jul 2017 03:28:38 -0000 @@ -166,7 +166,7 @@ com_fdt_attach(struct device *parent, st com_attach_subr(&sc->sc); - arm_intr_establish_fdt(faa->fa_node, IPL_TTY, intr, + fdt_establish_intr(faa->fa_node, IPL_TTY, intr, sc, sc->sc.sc_dev.dv_xname); } Index: arch/armv7/dev/pluart.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/dev/pluart.c,v retrieving revision 1.4 diff -u -p -r1.4 pluart.c --- arch/armv7/dev/pluart.c 30 Apr 2017 16:45:45 -0000 1.4 +++ arch/armv7/dev/pluart.c 25 Jul 2017 03:28:38 -0000 @@ -243,7 +243,7 @@ pluartattach(struct device *parent, stru return; } - sc->sc_irq = arm_intr_establish_fdt(faa->fa_node, IPL_TTY, pluart_intr, + sc->sc_irq = fdt_intr_establish(faa->fa_node, IPL_TTY, pluart_intr, sc, sc->sc_dev.dv_xname); sc->sc_iot = faa->fa_iot; Index: arch/armv7/exynos/exehci.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/exynos/exehci.c,v retrieving revision 1.7 diff -u -p -r1.7 exehci.c --- arch/armv7/exynos/exehci.c 10 Mar 2017 21:26:19 -0000 1.7 +++ arch/armv7/exynos/exehci.c 25 Jul 2017 03:28:38 -0000 @@ -160,7 +160,7 @@ exehci_attach(struct device *parent, str exehci_setup(sc); - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_USB, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_USB, ehci_intr, &sc->sc, devname); if (sc->sc_ih == NULL) { printf(": unable to establish interrupt\n"); Index: arch/armv7/exynos/exuart.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/exynos/exuart.c,v retrieving revision 1.11 diff -u -p -r1.11 exuart.c --- arch/armv7/exynos/exuart.c 30 Apr 2017 13:04:49 -0000 1.11 +++ arch/armv7/exynos/exuart.c 25 Jul 2017 03:28:38 -0000 @@ -181,7 +181,7 @@ exuartattach(struct device *parent, stru sc->sc_iot = faa->fa_iot; - sc->sc_irq = arm_intr_establish_fdt(faa->fa_node, IPL_TTY, + sc->sc_irq = fdt_intr_establish(faa->fa_node, IPL_TTY, exuart_intr, sc, sc->sc_dev.dv_xname); if (bus_space_map(sc->sc_iot, faa->fa_reg[0].addr, faa->fa_reg[0].size, 0, &sc->sc_ioh)) Index: arch/armv7/imx/if_fec.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/imx/if_fec.c,v retrieving revision 1.20 diff -u -p -r1.20 if_fec.c --- arch/armv7/imx/if_fec.c 22 Jan 2017 10:17:37 -0000 1.20 +++ arch/armv7/imx/if_fec.c 25 Jul 2017 03:28:38 -0000 @@ -344,7 +344,7 @@ fec_attach(struct device *parent, struct HWRITE4(sc, ENET_EIMR, 0); HWRITE4(sc, ENET_EIR, 0xffffffff); - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_NET, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_NET, fec_intr, sc, sc->sc_dev.dv_xname); tsize = ENET_MAX_TXD * sizeof(struct fec_buf_desc); Index: arch/armv7/imx/imxahci.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/imx/imxahci.c,v retrieving revision 1.7 diff -u -p -r1.7 imxahci.c --- arch/armv7/imx/imxahci.c 4 Aug 2016 15:52:52 -0000 1.7 +++ arch/armv7/imx/imxahci.c 25 Jul 2017 03:28:38 -0000 @@ -126,7 +126,7 @@ imxahci_attach(struct device *parent, st faa->fa_reg[0].size, 0, &sc->sc_ioh)) panic("imxahci_attach: bus_space_map failed!"); - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_BIO, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_BIO, ahci_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { printf(": unable to establish interrupt\n"); Index: arch/armv7/imx/imxehci.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/imx/imxehci.c,v retrieving revision 1.19 diff -u -p -r1.19 imxehci.c --- arch/armv7/imx/imxehci.c 28 Dec 2016 22:45:24 -0000 1.19 +++ arch/armv7/imx/imxehci.c 25 Jul 2017 03:28:38 -0000 @@ -252,7 +252,7 @@ imxehci_attach(struct device *parent, st EOWRITE4(&sc->sc, EHCI_PORTSC(1), EOREAD4(&sc->sc, EHCI_PORTSC(1)) & ~EHCI_PS_PTS_UTMI_MASK); - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_USB, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_USB, ehci_intr, &sc->sc, devname); if (sc->sc_ih == NULL) { printf(": unable to establish interrupt\n"); Index: arch/armv7/imx/imxesdhc.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/imx/imxesdhc.c,v retrieving revision 1.37 diff -u -p -r1.37 imxesdhc.c --- arch/armv7/imx/imxesdhc.c 18 Jul 2017 18:45:44 -0000 1.37 +++ arch/armv7/imx/imxesdhc.c 25 Jul 2017 03:28:38 -0000 @@ -310,7 +310,7 @@ imxesdhc_attach(struct device *parent, s pinctrl_byname(faa->fa_node, "default"); - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_SDMMC, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_SDMMC, imxesdhc_intr, sc, sc->sc_dev.dv_xname); OF_getpropintarray(sc->sc_node, "cd-gpios", sc->sc_gpio, Index: arch/armv7/imx/imxgpio.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/imx/imxgpio.c,v retrieving revision 1.12 diff -u -p -r1.12 imxgpio.c --- arch/armv7/imx/imxgpio.c 22 Jun 2017 11:34:51 -0000 1.12 +++ arch/armv7/imx/imxgpio.c 25 Jul 2017 03:28:38 -0000 @@ -486,10 +486,10 @@ imxgpio_recalc_ipl(struct imxgpio_softc sc->sc_ipl = max; if (sc->sc_ih_l != NULL) - arm_intr_disestablish_fdt(sc->sc_ih_l); + fdt_intr_disestablish(sc->sc_ih_l); if (sc->sc_ih_h != NULL) - arm_intr_disestablish_fdt(sc->sc_ih_h); + fdt_intr_disestablish(sc->sc_ih_h); if (sc->sc_ipl != IPL_NONE) { sc->sc_ih_l = arm_intr_establish_fdt_idx(sc->sc_node, 0, Index: arch/armv7/imx/imxiic.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/imx/imxiic.c,v retrieving revision 1.13 diff -u -p -r1.13 imxiic.c --- arch/armv7/imx/imxiic.c 6 Mar 2017 06:44:46 -0000 1.13 +++ arch/armv7/imx/imxiic.c 25 Jul 2017 03:28:38 -0000 @@ -124,7 +124,7 @@ imxiic_attach(struct device *parent, str panic("imxiic_attach: bus_space_map failed!"); #if 0 - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_BIO, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_BIO, imxiic_intr, sc, sc->sc_dev.dv_xname); #endif Index: arch/armv7/imx/imxuart.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/imx/imxuart.c,v retrieving revision 1.14 diff -u -p -r1.14 imxuart.c --- arch/armv7/imx/imxuart.c 30 Apr 2017 13:04:49 -0000 1.14 +++ arch/armv7/imx/imxuart.c 25 Jul 2017 03:28:38 -0000 @@ -168,7 +168,7 @@ imxuart_attach(struct device *parent, st pinctrl_byname(faa->fa_node, "default"); - sc->sc_irq = arm_intr_establish_fdt(faa->fa_node, IPL_TTY, + sc->sc_irq = fdt_intr_establish(faa->fa_node, IPL_TTY, imxuart_intr, sc, sc->sc_dev.dv_xname); sc->sc_node = faa->fa_node; Index: arch/armv7/include/intr.h =================================================================== RCS file: /cvs/src/sys/arch/armv7/include/intr.h,v retrieving revision 1.6 diff -u -p -r1.6 intr.h --- arch/armv7/include/intr.h 9 Mar 2017 15:36:52 -0000 1.6 +++ arch/armv7/include/intr.h 25 Jul 2017 03:28:38 -0000 @@ -86,7 +86,7 @@ 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 *cookie, const char *name), void (*intr_disestablish)(void *cookie), const char *(*intr_string)(void *cookie), void (*intr_handle)(void *)); @@ -97,7 +97,7 @@ struct arm_intr_func { void (*x)(int); void (*setipl)(int); void *(*intr_establish)(int irqno, int level, int (*func)(void *), - void *cookie, char *name); + void *cookie, const char *name); void (*intr_disestablish)(void *cookie); const char *(*intr_string)(void *cookie); }; @@ -137,7 +137,7 @@ void arm_setsoftintr(int si); #include void *arm_intr_establish(int irqno, int level, int (*func)(void *), - void *cookie, char *name); + void *cookie, const char *name); void arm_intr_disestablish(void *cookie); const char *arm_intr_string(void *cookie); @@ -151,7 +151,7 @@ struct interrupt_controller { int ic_node; void *ic_cookie; void *(*ic_establish)(void *, int *, int, int (*)(void *), - void *, char *); + void *, const char *); void (*ic_disestablish)(void *); void (*ic_route)(void *, int, struct cpu_info *); @@ -162,15 +162,12 @@ struct interrupt_controller { void arm_intr_init_fdt(void); void arm_intr_register_fdt(struct interrupt_controller *); -void *arm_intr_establish_fdt(int, int, int (*)(void *), - void *, char *); void *arm_intr_establish_fdt_idx(int, int, int, int (*)(void *), - void *, char *); -void arm_intr_disestablish_fdt(void *); + void *, const char *); void arm_intr_route(void *, int, struct cpu_info *); void *arm_intr_parent_establish_fdt(void *, int *, int, - int (*)(void *), void *, char *); + int (*)(void *), void *, const char *); void arm_intr_parent_disestablish_fdt(void *); #ifdef DIAGNOSTIC Index: arch/armv7/marvell/mvahci.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/marvell/mvahci.c,v retrieving revision 1.1 diff -u -p -r1.1 mvahci.c --- arch/armv7/marvell/mvahci.c 24 Mar 2017 20:31:58 -0000 1.1 +++ arch/armv7/marvell/mvahci.c 25 Jul 2017 03:28:38 -0000 @@ -125,7 +125,7 @@ mvahci_attach(struct device *parent, str clock_enable_all(faa->fa_node); reset_deassert_all(faa->fa_node); - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_BIO, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_BIO, ahci_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { printf(": unable to establish interrupt\n"); @@ -144,7 +144,7 @@ mvahci_attach(struct device *parent, str return; irq: - arm_intr_disestablish_fdt(sc->sc_ih); + fdt_intr_disestablish(sc->sc_ih); unmap: bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_ios); } Index: arch/armv7/marvell/mvxhci.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/marvell/mvxhci.c,v retrieving revision 1.1 diff -u -p -r1.1 mvxhci.c --- arch/armv7/marvell/mvxhci.c 24 Mar 2017 20:27:27 -0000 1.1 +++ arch/armv7/marvell/mvxhci.c 25 Jul 2017 03:28:38 -0000 @@ -142,7 +142,7 @@ mvxhci_attach(struct device *parent, str bus_space_unmap(sc->sc.iot, sc->mbus_ioh, faa->fa_reg[1].size); - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_USB, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_USB, xhci_intr, &sc->sc, sc->sc.sc_bus.bdev.dv_xname); if (sc->sc_ih == NULL) { printf(": can't establish interrupt\n"); @@ -167,7 +167,7 @@ mvxhci_attach(struct device *parent, str return; disestablish_ret: - arm_intr_disestablish_fdt(sc->sc_ih); + fdt_intr_disestablish(sc->sc_ih); unmap: bus_space_unmap(sc->sc.iot, sc->sc.ioh, sc->sc.sc_size); } Index: arch/armv7/omap/edma.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/omap/edma.c,v retrieving revision 1.6 diff -u -p -r1.6 edma.c --- arch/armv7/omap/edma.c 1 Mar 2017 04:34:09 -0000 1.6 +++ arch/armv7/omap/edma.c 25 Jul 2017 03:28:38 -0000 @@ -130,7 +130,7 @@ edma_attach(struct device *parent, struc /* XXX IPL_VM ? */ /* Enable interrupts line */ - sc->sc_ih_comp = arm_intr_establish_fdt(faa->fa_node, IPL_VM, + sc->sc_ih_comp = fdt_intr_establish(faa->fa_node, IPL_VM, edma_comp_intr, sc, DEVNAME(sc)); if (sc->sc_ih_comp == NULL) { printf("%s: unable to establish interrupt comp\n", DEVNAME(sc)); Index: arch/armv7/omap/intc.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/omap/intc.c,v retrieving revision 1.7 diff -u -p -r1.7 intc.c --- arch/armv7/omap/intc.c 6 Aug 2016 18:21:34 -0000 1.7 +++ arch/armv7/omap/intc.c 25 Jul 2017 03:28:38 -0000 @@ -81,7 +81,7 @@ struct intrhand { int ih_ipl; /* IPL_* */ int ih_irq; /* IRQ number */ struct evcount ih_count; - char *ih_name; + const char *ih_name; }; struct intrq { @@ -109,7 +109,7 @@ int intc_splraise(int new); void intc_setipl(int new); void intc_calc_mask(void); void *intc_intr_establish_fdt(void *, int *, int, int (*)(void *), - void *, char *); + void *, const char *); struct cfattach intc_ca = { sizeof (struct device), intc_match, intc_attach @@ -354,7 +354,7 @@ intc_irq_handler(void *frame) void * intc_intr_establish(int irqno, int level, int (*func)(void *), - void *arg, char *name) + void *arg, const char *name) { int psw; struct intrhand *ih; @@ -388,7 +388,7 @@ intc_intr_establish(int irqno, int level void * intc_intr_establish_fdt(void *cookie, int *cell, int level, - int (*func)(void *), void *arg, char *name) + int (*func)(void *), void *arg, const char *name) { return intc_intr_establish(cell[0], level, func, arg, name); } Index: arch/armv7/omap/omehci.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/omap/omehci.c,v retrieving revision 1.4 diff -u -p -r1.4 omehci.c --- arch/armv7/omap/omehci.c 11 Aug 2016 01:53:18 -0000 1.4 +++ arch/armv7/omap/omehci.c 25 Jul 2017 03:28:38 -0000 @@ -217,7 +217,7 @@ omehci_attach(struct device *parent, str sc->sc.sc_offs = EREAD1(&sc->sc, EHCI_CAPLENGTH); EOWRITE2(&sc->sc, EHCI_USBINTR, 0); - sc->sc_ih = arm_intr_establish_fdt(node, IPL_USB, + sc->sc_ih = fdt_intr_establish(node, IPL_USB, ehci_intr, &sc->sc, devname); if (sc->sc_ih == NULL) { printf(": unable to establish interrupt\n"); Index: arch/armv7/omap/omgpio.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/omap/omgpio.c,v retrieving revision 1.10 diff -u -p -r1.10 omgpio.c --- arch/armv7/omap/omgpio.c 12 Aug 2016 03:22:41 -0000 1.10 +++ arch/armv7/omap/omgpio.c 25 Jul 2017 03:28:38 -0000 @@ -718,18 +718,18 @@ omgpio_recalc_interrupts(struct omgpio_s #if 0 if ((max == IPL_NONE || max != sc->sc_max_il) && sc->sc_ih_h != NULL) - arm_intr_disestablish_fdt(sc->sc_ih_h); + fdt_intr_disestablish(sc->sc_ih_h); if (max != IPL_NONE && max != sc->sc_max_il) { - sc->sc_ih_h = arm_intr_establish_fdt(sc->sc_node, max, omgpio_irq, + sc->sc_ih_h = fdt_intr_establish(sc->sc_node, max, omgpio_irq, sc, NULL); } #else if (sc->sc_ih_h != NULL) - arm_intr_disestablish_fdt(sc->sc_ih_h); + fdt_intr_disestablish(sc->sc_ih_h); if (max != IPL_NONE) { - sc->sc_ih_h = arm_intr_establish_fdt(sc->sc_node, max, omgpio_irq, + sc->sc_ih_h = fdt_establish_intr(sc->sc_node, max, omgpio_irq, sc, NULL); } #endif @@ -737,10 +737,10 @@ omgpio_recalc_interrupts(struct omgpio_s sc->sc_max_il = max; if (sc->sc_ih_l != NULL) - arm_intr_disestablish_fdt(sc->sc_ih_l); + fdt_intr_disestablish(sc->sc_ih_l); if (max != min) { - sc->sc_ih_h = arm_intr_establish_fdt(sc->sc_node, min, + sc->sc_ih_h = fdt_establish_intr(sc->sc_node, min, omgpio_irq_dummy, sc, NULL); } sc->sc_min_il = min; Index: arch/armv7/omap/ommmc.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/omap/ommmc.c,v retrieving revision 1.31 diff -u -p -r1.31 ommmc.c --- arch/armv7/omap/ommmc.c 21 Jan 2017 05:42:03 -0000 1.31 +++ arch/armv7/omap/ommmc.c 25 Jul 2017 03:28:38 -0000 @@ -337,7 +337,7 @@ ommmc_attach(struct device *parent, stru /* Enable ICLKEN, FCLKEN? */ prcm_enablemodule(PRCM_MMC0 + unit); - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_SDMMC, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_SDMMC, ommmc_intr, sc, DEVNAME(sc)); if (sc->sc_ih == NULL) { printf("%s: cannot map interrupt\n", DEVNAME(sc)); Index: arch/armv7/omap/ti_iic.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/omap/ti_iic.c,v retrieving revision 1.10 diff -u -p -r1.10 ti_iic.c --- arch/armv7/omap/ti_iic.c 19 Aug 2016 05:25:08 -0000 1.10 +++ arch/armv7/omap/ti_iic.c 25 Jul 2017 03:28:38 -0000 @@ -192,7 +192,7 @@ ti_iic_attach(struct device *parent, str pinctrl_byname(faa->fa_node, "default"); - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_NET, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_NET, ti_iic_intr, sc, DEVNAME(sc)); prcm_enablemodule(PRCM_I2C0 + unit); Index: arch/armv7/sunxi/sxiahci.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/sunxi/sxiahci.c,v retrieving revision 1.12 diff -u -p -r1.12 sxiahci.c --- arch/armv7/sunxi/sxiahci.c 21 Jan 2017 08:26:49 -0000 1.12 +++ arch/armv7/sunxi/sxiahci.c 25 Jul 2017 03:28:38 -0000 @@ -170,7 +170,7 @@ sxiahci_attach(struct device *parent, st if (target_supply) regulator_enable(target_supply); - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_BIO, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_BIO, ahci_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { printf(": unable to establish interrupt\n"); Index: arch/armv7/sunxi/sxie.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/sunxi/sxie.c,v retrieving revision 1.25 diff -u -p -r1.25 sxie.c --- arch/armv7/sunxi/sxie.c 22 Jan 2017 10:17:37 -0000 1.25 +++ arch/armv7/sunxi/sxie.c 25 Jul 2017 03:28:38 -0000 @@ -233,7 +233,7 @@ sxie_attach(struct device *parent, struc sxie_socware_init(sc); sc->txf_inuse = 0; - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_NET, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_NET, sxie_intr, sc, sc->sc_dev.dv_xname); s = splnet(); Index: arch/armv7/sunxi/sxiintc.c =================================================================== RCS file: /cvs/src/sys/arch/armv7/sunxi/sxiintc.c,v retrieving revision 1.3 diff -u -p -r1.3 sxiintc.c --- arch/armv7/sunxi/sxiintc.c 21 Jan 2017 08:26:49 -0000 1.3 +++ arch/armv7/sunxi/sxiintc.c 25 Jul 2017 03:28:38 -0000 @@ -123,7 +123,7 @@ struct intrhand { int ih_ipl; /* IPL_* */ int ih_irq; /* IRQ number */ struct evcount ih_count; - char *ih_name; + const char *ih_name; }; struct intrq { @@ -151,7 +151,7 @@ int sxiintc_splraise(int); void sxiintc_setipl(int); void sxiintc_calc_masks(void); void *sxiintc_intr_establish_fdt(void *, int *, int, int (*)(void *), - void *, char *); + void *, const char *); struct cfattach sxiintc_ca = { sizeof (struct device), sxiintc_match, sxiintc_attach @@ -374,7 +374,7 @@ sxiintc_irq_handler(void *frame) void * sxiintc_intr_establish(int irq, int level, int (*func)(void *), - void *arg, char *name) + void *arg, const char *name) { int psw; struct intrhand *ih; @@ -414,7 +414,7 @@ sxiintc_intr_establish(int irq, int leve void * sxiintc_intr_establish_fdt(void *cookie, int *cell, int level, - int (*func)(void *), void *arg, char *name) + int (*func)(void *), void *arg, const char *name) { return sxiintc_intr_establish(cell[0], level, func, arg, name); } Index: arch/octeon/dev/cn30xxuart.c =================================================================== RCS file: /cvs/src/sys/arch/octeon/dev/cn30xxuart.c,v retrieving revision 1.10 diff -u -p -r1.10 cn30xxuart.c --- arch/octeon/dev/cn30xxuart.c 3 Jul 2017 08:17:20 -0000 1.10 +++ arch/octeon/dev/cn30xxuart.c 25 Jul 2017 03:28:38 -0000 @@ -139,7 +139,7 @@ cn30xxuart_attach(struct device *parent, com_attach_subr(sc); - octeon_intr_establish_fdt(faa->fa_node, IPL_TTY, cn30xxuart_intr, sc, + fdt_intr_establish(faa->fa_node, IPL_TTY, cn30xxuart_intr, sc, sc->sc_dev.dv_xname); } Index: arch/octeon/dev/octcib.c =================================================================== RCS file: /cvs/src/sys/arch/octeon/dev/octcib.c,v retrieving revision 1.1 diff -u -p -r1.1 octcib.c --- arch/octeon/dev/octcib.c 13 Jul 2017 12:50:50 -0000 1.1 +++ arch/octeon/dev/octcib.c 25 Jul 2017 03:28:38 -0000 @@ -128,7 +128,7 @@ octcib_attach(struct device *parent, str /* Acknowledge any pending interrupts. */ CIB_RAW_WR(sc, ~0ul); - sc->sc_ih = octeon_intr_establish_fdt(faa->fa_node, + sc->sc_ih = fdt_intr_establish(faa->fa_node, CIB_HIGHIPL | IPL_MPSAFE, octcib_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { printf(": failed to register interrupt\n"); Index: arch/octeon/dev/octeon_intr.c =================================================================== RCS file: /cvs/src/sys/arch/octeon/dev/octeon_intr.c,v retrieving revision 1.22 diff -u -p -r1.22 octeon_intr.c --- arch/octeon/dev/octeon_intr.c 18 Jun 2017 13:58:44 -0000 1.22 +++ arch/octeon/dev/octeon_intr.c 25 Jul 2017 03:28:38 -0000 @@ -92,7 +92,7 @@ octeon_intr_establish(int irq, int level } void * -octeon_intr_establish_fdt(int node, int level, +fdt_intr_establish(int node, int level, int (*ih_fun)(void *), void *ih_arg, const char *ih_what) { return octeon_intr_establish_fdt_idx(node, 0, level, ih_fun, @@ -142,7 +142,7 @@ octeon_intr_disestablish(void *cookie) } void -octeon_intr_disestablish_fdt(void *cookie) +fdt_intr_disestablish(void *cookie) { struct intr_handle *ih = cookie; struct intr_controller *ic = ih->ih_ic; Index: arch/octeon/dev/octmmc.c =================================================================== RCS file: /cvs/src/sys/arch/octeon/dev/octmmc.c,v retrieving revision 1.4 diff -u -p -r1.4 octmmc.c --- arch/octeon/dev/octmmc.c 10 Jul 2017 16:17:51 -0000 1.4 +++ arch/octeon/dev/octmmc.c 25 Jul 2017 03:28:38 -0000 @@ -250,9 +250,9 @@ octmmc_attach(struct device *parent, str error: if (sc->sc_dma_ih != NULL) - octeon_intr_disestablish_fdt(sc->sc_dma_ih); + fdt_intr_disestablish(sc->sc_dma_ih); if (sc->sc_cmd_ih != NULL) - octeon_intr_disestablish_fdt(sc->sc_cmd_ih); + fdt_intr_disestablish(sc->sc_cmd_ih); if (sc->sc_dma_data != NULL) bus_dmamap_destroy(sc->sc_dmat, sc->sc_dma_data); if (sc->sc_dma_ioh != 0) Index: arch/octeon/include/fdt.h =================================================================== RCS file: /cvs/src/sys/arch/octeon/include/fdt.h,v retrieving revision 1.1 diff -u -p -r1.1 fdt.h --- arch/octeon/include/fdt.h 8 Dec 2016 16:24:51 -0000 1.1 +++ arch/octeon/include/fdt.h 25 Jul 2017 03:28:38 -0000 @@ -34,4 +34,7 @@ struct fdt_attach_args { int fa_scells; }; +void *fdt_intr_establish(int, int, int (*)(void *), void *, const char *); +void fdt_intr_disestablish(void *); + #endif /* __OCTEON_FDT_H__ */ Index: arch/octeon/include/intr.h =================================================================== RCS file: /cvs/src/sys/arch/octeon/include/intr.h,v retrieving revision 1.12 diff -u -p -r1.12 intr.h --- arch/octeon/include/intr.h 18 Jun 2017 13:58:45 -0000 1.12 +++ arch/octeon/include/intr.h 25 Jul 2017 03:28:38 -0000 @@ -214,11 +214,8 @@ void octeon_intr_disestablish(void *); void octeon_intr_init(void); void octeon_intr_register(struct intr_controller *); -void *octeon_intr_establish_fdt(int, int, int (*)(void *), - void *, const char *); void *octeon_intr_establish_fdt_idx(int, int, int, int (*)(void *), void *, const char *); -void octeon_intr_disestablish_fdt(void *); #endif /* _LOCORE */ Index: dev/fdt/ahci_fdt.c =================================================================== RCS file: /cvs/src/sys/dev/fdt/ahci_fdt.c,v retrieving revision 1.2 diff -u -p -r1.2 ahci_fdt.c --- dev/fdt/ahci_fdt.c 24 Feb 2017 17:12:31 -0000 1.2 +++ dev/fdt/ahci_fdt.c 25 Jul 2017 03:28:38 -0000 @@ -73,7 +73,7 @@ ahci_fdt_attach(struct device *parent, s faa->fa_reg[0].size, 0, &sc->sc_ioh)) panic("ahci_fdt_attach: bus_space_map failed!"); - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_BIO, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_BIO, ahci_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { printf(": unable to establish interrupt\n"); @@ -89,7 +89,7 @@ ahci_fdt_attach(struct device *parent, s return; irq: - arm_intr_disestablish_fdt(sc->sc_ih); + fdt_intr_disestablish(sc->sc_ih); unmap: bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_ios); } Index: dev/fdt/dwmmc.c =================================================================== RCS file: /cvs/src/sys/dev/fdt/dwmmc.c,v retrieving revision 1.4 diff -u -p -r1.4 dwmmc.c --- dev/fdt/dwmmc.c 23 Jul 2017 17:06:11 -0000 1.4 +++ dev/fdt/dwmmc.c 25 Jul 2017 03:28:38 -0000 @@ -252,7 +252,7 @@ dwmmc_attach(struct device *parent, stru ciu_div = OF_getpropint(faa->fa_node, "samsung,dw-mshc-ciu-div", 0); sc->sc_clkbase /= (ciu_div + 1); - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_BIO, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_BIO, dwmmc_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { printf(": can't establish interrupt\n"); Index: dev/fdt/ehci_fdt.c =================================================================== RCS file: /cvs/src/sys/dev/fdt/ehci_fdt.c,v retrieving revision 1.1 diff -u -p -r1.1 ehci_fdt.c --- dev/fdt/ehci_fdt.c 29 Apr 2017 20:49:09 -0000 1.1 +++ dev/fdt/ehci_fdt.c 25 Jul 2017 03:28:38 -0000 @@ -98,7 +98,7 @@ ehci_fdt_attach(struct device *parent, s sc->sc.sc_offs = EREAD1(&sc->sc, EHCI_CAPLENGTH); EOWRITE2(&sc->sc, EHCI_USBINTR, 0); - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_USB, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_USB, ehci_intr, &sc->sc, devname); if (sc->sc_ih == NULL) { printf(": can't establish interrupt\n"); @@ -123,7 +123,7 @@ ehci_fdt_attach(struct device *parent, s return; disestablish_intr: - arm_intr_disestablish_fdt(sc->sc_ih); + fdt_intr_disestablish(sc->sc_ih); sc->sc_ih = NULL; unmap: bus_space_unmap(sc->sc.iot, sc->sc.ioh, sc->sc.sc_size); @@ -143,7 +143,7 @@ ehci_fdt_detach(struct device *self, int return rv; if (sc->sc_ih != NULL) { - arm_intr_disestablish_fdt(sc->sc_ih); + fdt_intr_disestablish(sc->sc_ih); sc->sc_ih = NULL; } Index: dev/fdt/if_dwge_fdt.c =================================================================== RCS file: /cvs/src/sys/dev/fdt/if_dwge_fdt.c,v retrieving revision 1.4 diff -u -p -r1.4 if_dwge_fdt.c --- dev/fdt/if_dwge_fdt.c 23 Jul 2017 17:09:19 -0000 1.4 +++ dev/fdt/if_dwge_fdt.c 25 Jul 2017 03:28:38 -0000 @@ -141,7 +141,7 @@ dwge_fdt_attach(struct device *parent, s /* Reset PHY */ dwge_fdt_reset_phy(fsc); - fsc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_NET, + fsc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_NET, dwge_fdt_intr, sc, sc->sc_dev.dv_xname); if (fsc->sc_ih == NULL) { printf(": unable to establish interrupt\n"); Index: dev/fdt/sdhc_fdt.c =================================================================== RCS file: /cvs/src/sys/dev/fdt/sdhc_fdt.c,v retrieving revision 1.2 diff -u -p -r1.2 sdhc_fdt.c --- dev/fdt/sdhc_fdt.c 6 May 2017 16:25:48 -0000 1.2 +++ dev/fdt/sdhc_fdt.c 25 Jul 2017 03:28:38 -0000 @@ -84,7 +84,7 @@ sdhc_fdt_attach(struct device *parent, s clock_enable_all(faa->fa_node); reset_deassert_all(faa->fa_node); - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_BIO, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_BIO, sdhc_intr, sc, sc->sc.sc_dev.dv_xname); if (sc->sc_ih == NULL) { printf(": can't establish interrupt\n"); Index: dev/fdt/sximmc.c =================================================================== RCS file: /cvs/src/sys/dev/fdt/sximmc.c,v retrieving revision 1.2 diff -u -p -r1.2 sximmc.c --- dev/fdt/sximmc.c 22 Jun 2017 02:44:37 -0000 1.2 +++ dev/fdt/sximmc.c 25 Jul 2017 03:28:38 -0000 @@ -414,7 +414,7 @@ sximmc_attach(struct device *parent, str sc->sc_vmmc = OF_getpropint(sc->sc_node, "vmmc-supply", 0); sc->sc_pwrseq = OF_getpropint(sc->sc_node, "mmc-pwrseq", 0); - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_BIO, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_BIO, sximmc_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { printf(": can't to establish interrupt\n"); Index: dev/fdt/sxitwi.c =================================================================== RCS file: /cvs/src/sys/dev/fdt/sxitwi.c,v retrieving revision 1.1 diff -u -p -r1.1 sxitwi.c --- dev/fdt/sxitwi.c 23 Jul 2017 19:26:03 -0000 1.1 +++ dev/fdt/sxitwi.c 25 Jul 2017 03:28:38 -0000 @@ -232,7 +232,7 @@ sxitwi_attach(struct device *parent, str sxitwi_write_4(sc, TWSI_SOFTRESET, SOFTRESET_VAL); /* Establish interrupt */ - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_BIO, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_BIO, sxitwi_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { printf(": can't to establish interrupt\n"); Index: dev/fdt/virtio_mmio.c =================================================================== RCS file: /cvs/src/sys/dev/fdt/virtio_mmio.c,v retrieving revision 1.2 diff -u -p -r1.2 virtio_mmio.c --- dev/fdt/virtio_mmio.c 24 Feb 2017 17:12:31 -0000 1.2 +++ dev/fdt/virtio_mmio.c 25 Jul 2017 03:28:38 -0000 @@ -254,7 +254,7 @@ virtio_mmio_attach(struct device *parent goto fail_1; } - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, vsc->sc_ipl, + sc->sc_ih = fdt_intr_establish(faa->fa_node, vsc->sc_ipl, virtio_mmio_intr, sc, vsc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { printf("%s: couldn't establish interrupt\n", @@ -286,7 +286,7 @@ virtio_mmio_detach(struct device *self, } KASSERT(vsc->sc_child == 0 || vsc->sc_child == VIRTIO_CHILD_ERROR); KASSERT(vsc->sc_vqs == 0); - arm_intr_disestablish_fdt(sc->sc_ih); + fdt_intr_disestablish(sc->sc_ih); sc->sc_ih = 0; if (sc->sc_iosize) bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_iosize); Index: dev/fdt/xhci_fdt.c =================================================================== RCS file: /cvs/src/sys/dev/fdt/xhci_fdt.c,v retrieving revision 1.3 diff -u -p -r1.3 xhci_fdt.c --- dev/fdt/xhci_fdt.c 2 Jun 2017 11:06:08 -0000 1.3 +++ dev/fdt/xhci_fdt.c 25 Jul 2017 03:28:38 -0000 @@ -83,7 +83,7 @@ xhci_fdt_attach(struct device *parent, s return; } - sc->sc_ih = arm_intr_establish_fdt(faa->fa_node, IPL_USB, + sc->sc_ih = fdt_intr_establish(faa->fa_node, IPL_USB, xhci_intr, sc, sc->sc.sc_bus.bdev.dv_xname); if (sc->sc_ih == NULL) { printf(": can't establish interrupt\n"); @@ -109,7 +109,7 @@ xhci_fdt_attach(struct device *parent, s return; disestablish_ret: - arm_intr_disestablish_fdt(sc->sc_ih); + fdt_intr_disestablish(sc->sc_ih); unmap: bus_space_unmap(sc->sc.iot, sc->sc.ioh, sc->sc.sc_size); }