diff --git a/sys/arm/allwinner/a10/a10_intc.c b/sys/arm/allwinner/a10/a10_intc.c index 52f0c15e9d5a0..a0cde4633605f 100644 --- a/sys/arm/allwinner/a10/a10_intc.c +++ b/sys/arm/allwinner/a10/a10_intc.c @@ -372,8 +372,8 @@ static device_method_t a10_aintc_methods[] = { DEVMETHOD(intr_event_post_filter, a10_intr_post_filter), /* Interrupt controller interface */ - DEVMETHOD(pic_disable_intr, a10_intr_disable_intr), - DEVMETHOD(pic_enable_intr, a10_intr_enable_intr), + DEVMETHOD(pic_disable, a10_intr_disable_intr), + DEVMETHOD(pic_enable, a10_intr_enable_intr), DEVMETHOD(pic_map_intr, a10_intr_map_intr), DEVMETHOD_END diff --git a/sys/arm/allwinner/aw_gpio.c b/sys/arm/allwinner/aw_gpio.c index d3f3c5079ebfc..5d02f58af01b4 100644 --- a/sys/arm/allwinner/aw_gpio.c +++ b/sys/arm/allwinner/aw_gpio.c @@ -1458,8 +1458,8 @@ static device_method_t aw_gpio_methods[] = { DEVMETHOD(intr_event_post_filter, aw_gpio_pic_post_filter), /* Interrupt controller interface */ - DEVMETHOD(pic_disable_intr, aw_gpio_pic_disable_intr), - DEVMETHOD(pic_enable_intr, aw_gpio_pic_enable_intr), + DEVMETHOD(pic_disable, aw_gpio_pic_disable_intr), + DEVMETHOD(pic_enable, aw_gpio_pic_enable_intr), DEVMETHOD(pic_map_intr, aw_gpio_pic_map_intr), DEVMETHOD(pic_setup_intr, aw_gpio_pic_setup_intr), DEVMETHOD(pic_teardown_intr, aw_gpio_pic_teardown_intr), diff --git a/sys/arm/allwinner/aw_nmi.c b/sys/arm/allwinner/aw_nmi.c index 7ce7c898aaeda..6741c7a4615a5 100644 --- a/sys/arm/allwinner/aw_nmi.c +++ b/sys/arm/allwinner/aw_nmi.c @@ -399,8 +399,8 @@ static device_method_t aw_nmi_methods[] = { DEVMETHOD(intr_event_post_filter, aw_nmi_post_filter), /* Interrupt controller interface */ - DEVMETHOD(pic_disable_intr, aw_nmi_disable_intr), - DEVMETHOD(pic_enable_intr, aw_nmi_enable_intr), + DEVMETHOD(pic_disable, aw_nmi_disable_intr), + DEVMETHOD(pic_enable, aw_nmi_enable_intr), DEVMETHOD(pic_map_intr, aw_nmi_map_intr), DEVMETHOD(pic_setup_intr, aw_nmi_setup_intr), DEVMETHOD(pic_teardown_intr, aw_nmi_teardown_intr), diff --git a/sys/arm/allwinner/aw_r_intc.c b/sys/arm/allwinner/aw_r_intc.c index 26f1187998258..ec346b53aeb91 100644 --- a/sys/arm/allwinner/aw_r_intc.c +++ b/sys/arm/allwinner/aw_r_intc.c @@ -159,7 +159,7 @@ aw_r_intc_gicp_enable_intr(device_t dev, struct intr_irqsrc *isrc) sc = device_get_softc(dev); - PIC_ENABLE_INTR(sc->parent, isrc); + PIC_ENABLE(sc->parent, isrc); } static void @@ -169,7 +169,7 @@ aw_r_intc_gicp_disable_intr(device_t dev, struct intr_irqsrc *isrc) sc = device_get_softc(dev); - PIC_DISABLE_INTR(sc->parent, isrc); + PIC_DISABLE(sc->parent, isrc); } static int @@ -279,8 +279,8 @@ static device_method_t aw_r_intc_gicp_methods[] = { /* Interrupt controller interface */ DEVMETHOD(pic_activate_intr, aw_r_intc_gicp_activate_intr), - DEVMETHOD(pic_disable_intr, aw_r_intc_gicp_disable_intr), - DEVMETHOD(pic_enable_intr, aw_r_intc_gicp_enable_intr), + DEVMETHOD(pic_disable, aw_r_intc_gicp_disable_intr), + DEVMETHOD(pic_enable, aw_r_intc_gicp_enable_intr), DEVMETHOD(pic_map_intr, aw_r_intc_gicp_map_intr), DEVMETHOD(pic_deactivate_intr, aw_r_intc_gicp_deactivate_intr), DEVMETHOD(pic_setup_intr, aw_r_intc_gicp_setup_intr), diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c index d4b78de4a9698..48018f4924637 100644 --- a/sys/arm/arm/gic.c +++ b/sys/arm/arm/gic.c @@ -1230,8 +1230,8 @@ static device_method_t arm_gic_methods[] = { DEVMETHOD(intr_event_post_filter, arm_gic_post_filter), /* Interrupt controller interface */ - DEVMETHOD(pic_disable_intr, arm_gic_disable_intr), - DEVMETHOD(pic_enable_intr, arm_gic_enable_intr), + DEVMETHOD(pic_disable, arm_gic_disable_intr), + DEVMETHOD(pic_enable, arm_gic_enable_intr), DEVMETHOD(pic_map_intr, arm_gic_map_intr), DEVMETHOD(pic_setup_intr, arm_gic_setup_intr), DEVMETHOD(pic_teardown_intr, arm_gic_teardown_intr), diff --git a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c index 238965e99f0e2..640d01fdbeadb 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c @@ -1336,8 +1336,8 @@ static device_method_t bcm_gpio_methods[] = { DEVMETHOD(intr_event_post_filter, bcm_gpio_pic_post_filter), /* Interrupt controller interface */ - DEVMETHOD(pic_disable_intr, bcm_gpio_pic_disable_intr), - DEVMETHOD(pic_enable_intr, bcm_gpio_pic_enable_intr), + DEVMETHOD(pic_disable, bcm_gpio_pic_disable_intr), + DEVMETHOD(pic_enable, bcm_gpio_pic_enable_intr), DEVMETHOD(pic_map_intr, bcm_gpio_pic_map_intr), DEVMETHOD(pic_setup_intr, bcm_gpio_pic_setup_intr), DEVMETHOD(pic_teardown_intr, bcm_gpio_pic_teardown_intr), diff --git a/sys/arm/broadcom/bcm2835/bcm2835_intr.c b/sys/arm/broadcom/bcm2835/bcm2835_intr.c index f4cd2b5fd4f98..a371766d90e2f 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_intr.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_intr.c @@ -436,8 +436,8 @@ static device_method_t bcm_intc_methods[] = { DEVMETHOD(intr_event_post_ithread, bcm_intc_post_ithread), DEVMETHOD(intr_event_post_filter, bcm_intc_post_filter), - DEVMETHOD(pic_disable_intr, bcm_intc_disable_intr), - DEVMETHOD(pic_enable_intr, bcm_intc_enable_intr), + DEVMETHOD(pic_disable, bcm_intc_disable_intr), + DEVMETHOD(pic_enable, bcm_intc_enable_intr), DEVMETHOD(pic_map_intr, bcm_intc_map_intr), DEVMETHOD_END diff --git a/sys/arm/broadcom/bcm2835/bcm2836.c b/sys/arm/broadcom/bcm2835/bcm2836.c index 814301a12e897..896b6a06fbe4a 100644 --- a/sys/arm/broadcom/bcm2835/bcm2836.c +++ b/sys/arm/broadcom/bcm2835/bcm2836.c @@ -731,8 +731,8 @@ static device_method_t bcm_lintc_methods[] = { DEVMETHOD(intr_event_post_ithread, bcm_lintc_post_ithread), DEVMETHOD(intr_event_post_filter, bcm_lintc_post_filter), - DEVMETHOD(pic_disable_intr, bcm_lintc_disable_intr), - DEVMETHOD(pic_enable_intr, bcm_lintc_enable_intr), + DEVMETHOD(pic_disable, bcm_lintc_disable_intr), + DEVMETHOD(pic_enable, bcm_lintc_enable_intr), DEVMETHOD(pic_map_intr, bcm_lintc_map_intr), DEVMETHOD(pic_setup_intr, bcm_lintc_setup_intr), #ifdef SMP diff --git a/sys/arm/freescale/imx/imx_gpio.c b/sys/arm/freescale/imx/imx_gpio.c index c10ce9ad303b7..38471ccd99932 100644 --- a/sys/arm/freescale/imx/imx_gpio.c +++ b/sys/arm/freescale/imx/imx_gpio.c @@ -923,8 +923,8 @@ static device_method_t imx51_gpio_methods[] = { #ifdef INTRNG /* Interrupt controller interface */ - DEVMETHOD(pic_disable_intr, gpio_pic_disable_intr), - DEVMETHOD(pic_enable_intr, gpio_pic_enable_intr), + DEVMETHOD(pic_disable, gpio_pic_disable_intr), + DEVMETHOD(pic_enable, gpio_pic_enable_intr), DEVMETHOD(pic_map_intr, gpio_pic_map_intr), DEVMETHOD(pic_setup_intr, gpio_pic_setup_intr), DEVMETHOD(pic_teardown_intr, gpio_pic_teardown_intr), diff --git a/sys/arm/mv/mpic.c b/sys/arm/mv/mpic.c index 690c360be7a4b..00bd3c87c6d01 100644 --- a/sys/arm/mv/mpic.c +++ b/sys/arm/mv/mpic.c @@ -382,8 +382,8 @@ static device_method_t mv_mpic_methods[] = { DEVMETHOD(intr_event_post_ithread, mpic_post_ithread), DEVMETHOD(intr_event_post_filter, mpic_post_filter), - DEVMETHOD(pic_disable_intr, mpic_disable_intr), - DEVMETHOD(pic_enable_intr, mpic_enable_intr), + DEVMETHOD(pic_disable, mpic_disable_intr), + DEVMETHOD(pic_enable, mpic_enable_intr), DEVMETHOD(pic_map_intr, mpic_map_intr), DEVMETHOD(pic_ipi_send, mpic_ipi_send), diff --git a/sys/arm/mv/mv_ap806_gicp.c b/sys/arm/mv/mv_ap806_gicp.c index 3635b6500f410..7e03a42ed5045 100644 --- a/sys/arm/mv/mv_ap806_gicp.c +++ b/sys/arm/mv/mv_ap806_gicp.c @@ -239,7 +239,7 @@ mv_ap806_gicp_enable_intr(device_t dev, struct intr_irqsrc *isrc) sc = device_get_softc(dev); - PIC_ENABLE_INTR(sc->parent, isrc); + PIC_ENABLE(sc->parent, isrc); } static void @@ -249,7 +249,7 @@ mv_ap806_gicp_disable_intr(device_t dev, struct intr_irqsrc *isrc) sc = device_get_softc(dev); - PIC_DISABLE_INTR(sc->parent, isrc); + PIC_DISABLE(sc->parent, isrc); } static int @@ -424,8 +424,8 @@ static device_method_t mv_ap806_gicp_methods[] = { /* Interrupt controller interface */ DEVMETHOD(pic_activate_intr, mv_ap806_gicp_activate_intr), - DEVMETHOD(pic_disable_intr, mv_ap806_gicp_disable_intr), - DEVMETHOD(pic_enable_intr, mv_ap806_gicp_enable_intr), + DEVMETHOD(pic_disable, mv_ap806_gicp_disable_intr), + DEVMETHOD(pic_enable, mv_ap806_gicp_enable_intr), DEVMETHOD(pic_map_intr, mv_ap806_gicp_map_intr), DEVMETHOD(pic_deactivate_intr, mv_ap806_gicp_deactivate_intr), DEVMETHOD(pic_setup_intr, mv_ap806_gicp_setup_intr), diff --git a/sys/arm/mv/mv_ap806_sei.c b/sys/arm/mv/mv_ap806_sei.c index 506b9d8c60db1..ba1ba6d15d08d 100644 --- a/sys/arm/mv/mv_ap806_sei.c +++ b/sys/arm/mv/mv_ap806_sei.c @@ -483,8 +483,8 @@ static device_method_t mv_ap806_sei_methods[] = { DEVMETHOD(intr_event_post_filter, mv_ap806_sei_post_filter), /* Interrupt controller interface */ - DEVMETHOD(pic_disable_intr, mv_ap806_sei_disable_intr), - DEVMETHOD(pic_enable_intr, mv_ap806_sei_enable_intr), + DEVMETHOD(pic_disable, mv_ap806_sei_disable_intr), + DEVMETHOD(pic_enable, mv_ap806_sei_enable_intr), DEVMETHOD(pic_map_intr, mv_ap806_sei_map_intr), DEVMETHOD(pic_setup_intr, mv_ap806_sei_setup_intr), DEVMETHOD(pic_teardown_intr, mv_ap806_sei_teardown_intr), diff --git a/sys/arm/mv/mv_cp110_icu.c b/sys/arm/mv/mv_cp110_icu.c index 356f6743b4c21..fde8965216d9a 100644 --- a/sys/arm/mv/mv_cp110_icu.c +++ b/sys/arm/mv/mv_cp110_icu.c @@ -224,7 +224,7 @@ mv_cp110_icu_enable_intr(device_t dev, struct intr_irqsrc *isrc) struct mv_cp110_icu_softc *sc; sc = device_get_softc(dev); - PIC_ENABLE_INTR(sc->parent, isrc); + PIC_ENABLE(sc->parent, isrc); } static void @@ -234,7 +234,7 @@ mv_cp110_icu_disable_intr(device_t dev, struct intr_irqsrc *isrc) sc = device_get_softc(dev); - PIC_DISABLE_INTR(sc->parent, isrc); + PIC_DISABLE(sc->parent, isrc); } static void @@ -442,8 +442,8 @@ static device_method_t mv_cp110_icu_methods[] = { /* Interrupt controller interface */ DEVMETHOD(pic_activate_intr, mv_cp110_icu_activate_intr), - DEVMETHOD(pic_disable_intr, mv_cp110_icu_disable_intr), - DEVMETHOD(pic_enable_intr, mv_cp110_icu_enable_intr), + DEVMETHOD(pic_disable, mv_cp110_icu_disable_intr), + DEVMETHOD(pic_enable, mv_cp110_icu_enable_intr), DEVMETHOD(pic_map_intr, mv_cp110_icu_map_intr), DEVMETHOD(pic_deactivate_intr, mv_cp110_icu_deactivate_intr), DEVMETHOD(pic_setup_intr, mv_cp110_icu_setup_intr), diff --git a/sys/arm/mv/mvebu_gpio.c b/sys/arm/mv/mvebu_gpio.c index fb7b7a402fd2a..7af77bbdca575 100644 --- a/sys/arm/mv/mvebu_gpio.c +++ b/sys/arm/mv/mvebu_gpio.c @@ -844,8 +844,8 @@ static device_method_t mvebu_gpio_methods[] = { DEVMETHOD(intr_event_post_filter, mvebu_gpio_pic_post_filter), /* Interrupt controller interface */ - DEVMETHOD(pic_disable_intr, mvebu_gpio_pic_disable_intr), - DEVMETHOD(pic_enable_intr, mvebu_gpio_pic_enable_intr), + DEVMETHOD(pic_disable, mvebu_gpio_pic_disable_intr), + DEVMETHOD(pic_enable, mvebu_gpio_pic_enable_intr), DEVMETHOD(pic_map_intr, mvebu_gpio_pic_map_intr), DEVMETHOD(pic_setup_intr, mvebu_gpio_pic_setup_intr), DEVMETHOD(pic_teardown_intr, mvebu_gpio_pic_teardown_intr), diff --git a/sys/arm/nvidia/tegra_gpio.c b/sys/arm/nvidia/tegra_gpio.c index b9b4fd0c86c82..887a3c6e2d034 100644 --- a/sys/arm/nvidia/tegra_gpio.c +++ b/sys/arm/nvidia/tegra_gpio.c @@ -858,8 +858,8 @@ static device_method_t tegra_gpio_methods[] = { DEVMETHOD(intr_event_post_filter, tegra_gpio_pic_post_filter), /* Interrupt controller interface */ - DEVMETHOD(pic_disable_intr, tegra_gpio_pic_disable_intr), - DEVMETHOD(pic_enable_intr, tegra_gpio_pic_enable_intr), + DEVMETHOD(pic_disable, tegra_gpio_pic_disable_intr), + DEVMETHOD(pic_enable, tegra_gpio_pic_enable_intr), DEVMETHOD(pic_map_intr, tegra_gpio_pic_map_intr), DEVMETHOD(pic_setup_intr, tegra_gpio_pic_setup_intr), DEVMETHOD(pic_teardown_intr, tegra_gpio_pic_teardown_intr), diff --git a/sys/arm/nvidia/tegra_lic.c b/sys/arm/nvidia/tegra_lic.c index a5325f10f38a2..4fc3dfb52265b 100644 --- a/sys/arm/nvidia/tegra_lic.c +++ b/sys/arm/nvidia/tegra_lic.c @@ -100,7 +100,7 @@ tegra_lic_disable_intr(device_t dev, struct intr_irqsrc *isrc) { struct tegra_lic_sc *sc = device_get_softc(dev); - PIC_DISABLE_INTR(sc->parent, isrc); + PIC_DISABLE(sc->parent, isrc); } static void @@ -108,7 +108,7 @@ tegra_lic_enable_intr(device_t dev, struct intr_irqsrc *isrc) { struct tegra_lic_sc *sc = device_get_softc(dev); - PIC_ENABLE_INTR(sc->parent, isrc); + PIC_ENABLE(sc->parent, isrc); } static int @@ -269,8 +269,8 @@ static device_method_t tegra_lic_methods[] = { /* Interrupt controller interface */ DEVMETHOD(pic_activate_intr, tegra_lic_activate_intr), - DEVMETHOD(pic_disable_intr, tegra_lic_disable_intr), - DEVMETHOD(pic_enable_intr, tegra_lic_enable_intr), + DEVMETHOD(pic_disable, tegra_lic_disable_intr), + DEVMETHOD(pic_enable, tegra_lic_enable_intr), DEVMETHOD(pic_map_intr, tegra_lic_map_intr), DEVMETHOD(pic_deactivate_intr, tegra_lic_deactivate_intr), DEVMETHOD(pic_setup_intr, tegra_lic_setup_intr), diff --git a/sys/arm/nvidia/tegra_pcie.c b/sys/arm/nvidia/tegra_pcie.c index e3c3bf4e23222..4711fdcf3e754 100644 --- a/sys/arm/nvidia/tegra_pcie.c +++ b/sys/arm/nvidia/tegra_pcie.c @@ -1605,8 +1605,8 @@ static device_method_t tegra_pcib_methods[] = { DEVMETHOD(msi_map_msi, tegra_pcib_msi_map_msi), /* Interrupt controller interface */ - DEVMETHOD(pic_disable_intr, tegra_pcib_msi_disable_intr), - DEVMETHOD(pic_enable_intr, tegra_pcib_msi_enable_intr), + DEVMETHOD(pic_disable, tegra_pcib_msi_disable_intr), + DEVMETHOD(pic_enable, tegra_pcib_msi_enable_intr), DEVMETHOD(pic_setup_intr, tegra_pcib_msi_setup_intr), DEVMETHOD(pic_teardown_intr, tegra_pcib_msi_teardown_intr), #endif diff --git a/sys/arm/ti/aintc.c b/sys/arm/ti/aintc.c index a1e1c5c3c66f8..6b564cbfe89d7 100644 --- a/sys/arm/ti/aintc.c +++ b/sys/arm/ti/aintc.c @@ -291,8 +291,8 @@ static device_method_t ti_aintc_methods[] = { DEVMETHOD(intr_event_post_ithread, ti_aintc_post_ithread), DEVMETHOD(intr_event_post_filter, ti_aintc_post_filter), - DEVMETHOD(pic_disable_intr, ti_aintc_disable_intr), - DEVMETHOD(pic_enable_intr, ti_aintc_enable_intr), + DEVMETHOD(pic_disable, ti_aintc_disable_intr), + DEVMETHOD(pic_enable, ti_aintc_enable_intr), DEVMETHOD(pic_map_intr, ti_aintc_map_intr), DEVMETHOD_END diff --git a/sys/arm/ti/omap4/omap4_wugen.c b/sys/arm/ti/omap4/omap4_wugen.c index 53655d071e76d..e54c996572b9b 100644 --- a/sys/arm/ti/omap4/omap4_wugen.c +++ b/sys/arm/ti/omap4/omap4_wugen.c @@ -229,8 +229,8 @@ static device_method_t omap4_wugen_methods[] = { /* Interrupt controller interface */ DEVMETHOD(pic_activate_intr, omap4_wugen_activate_intr), - DEVMETHOD(pic_disable_intr, omap4_wugen_disable_intr), - DEVMETHOD(pic_enable_intr, omap4_wugen_enable_intr), + DEVMETHOD(pic_disable, omap4_wugen_disable_intr), + DEVMETHOD(pic_enable, omap4_wugen_enable_intr), DEVMETHOD(pic_map_intr, omap4_wugen_map_intr), DEVMETHOD(pic_deactivate_intr, omap4_wugen_deactivate_intr), DEVMETHOD(pic_setup_intr, omap4_wugen_setup_intr), diff --git a/sys/arm/ti/ti_gpio.c b/sys/arm/ti/ti_gpio.c index 193ba9af8208f..496e13cef6ac5 100644 --- a/sys/arm/ti/ti_gpio.c +++ b/sys/arm/ti/ti_gpio.c @@ -1106,8 +1106,8 @@ static device_method_t ti_gpio_methods[] = { DEVMETHOD(gpio_pin_toggle, ti_gpio_pin_toggle), /* Interrupt controller interface */ - DEVMETHOD(pic_disable_intr, ti_gpio_pic_disable_intr), - DEVMETHOD(pic_enable_intr, ti_gpio_pic_enable_intr), + DEVMETHOD(pic_disable, ti_gpio_pic_disable_intr), + DEVMETHOD(pic_enable, ti_gpio_pic_enable_intr), DEVMETHOD(pic_map_intr, ti_gpio_pic_map_intr), DEVMETHOD(pic_setup_intr, ti_gpio_pic_setup_intr), DEVMETHOD(pic_teardown_intr, ti_gpio_pic_teardown_intr), diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c index 6b1628b0ddab9..0f5a6c483d70f 100644 --- a/sys/arm64/arm64/gic_v3.c +++ b/sys/arm64/arm64/gic_v3.c @@ -79,8 +79,8 @@ static bus_read_ivar_t gic_v3_read_ivar; static bus_write_ivar_t gic_v3_write_ivar; static bus_alloc_resource_t gic_v3_alloc_resource; -static pic_disable_intr_t gic_v3_disable_intr; -static pic_enable_intr_t gic_v3_enable_intr; +static pic_disable_t gic_v3_disable_intr; +static pic_enable_t gic_v3_enable_intr; static pic_map_intr_t gic_v3_map_intr; static pic_setup_intr_t gic_v3_setup_intr; static pic_teardown_intr_t gic_v3_teardown_intr; @@ -130,8 +130,8 @@ static device_method_t gic_v3_methods[] = { DEVMETHOD(intr_event_post_filter, gic_v3_post_filter), /* Interrupt controller interface */ - DEVMETHOD(pic_disable_intr, gic_v3_disable_intr), - DEVMETHOD(pic_enable_intr, gic_v3_enable_intr), + DEVMETHOD(pic_disable, gic_v3_disable_intr), + DEVMETHOD(pic_enable, gic_v3_enable_intr), DEVMETHOD(pic_map_intr, gic_v3_map_intr), DEVMETHOD(pic_setup_intr, gic_v3_setup_intr), DEVMETHOD(pic_teardown_intr, gic_v3_teardown_intr), diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index 6220741d3bc24..fccc6e7971d6c 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -324,8 +324,8 @@ static const struct { static device_attach_t gicv3_its_attach; static device_detach_t gicv3_its_detach; -static pic_disable_intr_t gicv3_its_disable_intr; -static pic_enable_intr_t gicv3_its_enable_intr; +static pic_disable_t gicv3_its_disable_intr; +static pic_enable_t gicv3_its_enable_intr; static pic_map_intr_t gicv3_its_map_intr; static pic_setup_intr_t gicv3_its_setup_intr; static intr_event_post_filter_t gicv3_its_post_filter; @@ -362,8 +362,8 @@ static device_method_t gicv3_its_methods[] = { DEVMETHOD(intr_event_post_filter, gicv3_its_post_filter), /* Interrupt controller interface */ - DEVMETHOD(pic_disable_intr, gicv3_its_disable_intr), - DEVMETHOD(pic_enable_intr, gicv3_its_enable_intr), + DEVMETHOD(pic_disable, gicv3_its_disable_intr), + DEVMETHOD(pic_enable, gicv3_its_enable_intr), DEVMETHOD(pic_map_intr, gicv3_its_map_intr), DEVMETHOD(pic_setup_intr, gicv3_its_setup_intr), #ifdef SMP diff --git a/sys/arm64/freescale/imx/imx7gpc.c b/sys/arm64/freescale/imx/imx7gpc.c index 5aa4f414e785c..e9e1904bfccdb 100644 --- a/sys/arm64/freescale/imx/imx7gpc.c +++ b/sys/arm64/freescale/imx/imx7gpc.c @@ -70,7 +70,7 @@ imx7gpc_disable_intr(device_t dev, struct intr_irqsrc *isrc) { struct imx7gpc_softc *sc = device_get_softc(dev); - PIC_DISABLE_INTR(sc->parent, isrc); + PIC_DISABLE(sc->parent, isrc); } static void @@ -78,7 +78,7 @@ imx7gpc_enable_intr(device_t dev, struct intr_irqsrc *isrc) { struct imx7gpc_softc *sc = device_get_softc(dev); - PIC_ENABLE_INTR(sc->parent, isrc); + PIC_ENABLE(sc->parent, isrc); } static int @@ -219,8 +219,8 @@ static device_method_t imx7gpc_methods[] = { /* Interrupt controller interface */ DEVMETHOD(pic_activate_intr, imx7gpc_activate_intr), - DEVMETHOD(pic_disable_intr, imx7gpc_disable_intr), - DEVMETHOD(pic_enable_intr, imx7gpc_enable_intr), + DEVMETHOD(pic_disable, imx7gpc_disable_intr), + DEVMETHOD(pic_enable, imx7gpc_enable_intr), DEVMETHOD(pic_map_intr, imx7gpc_map_intr), DEVMETHOD(pic_deactivate_intr, imx7gpc_deactivate_intr), DEVMETHOD(pic_setup_intr, imx7gpc_setup_intr), diff --git a/sys/arm64/qoriq/qoriq_gpio_pic.c b/sys/arm64/qoriq/qoriq_gpio_pic.c index c481126d63f50..763619a9808b0 100644 --- a/sys/arm64/qoriq/qoriq_gpio_pic.c +++ b/sys/arm64/qoriq/qoriq_gpio_pic.c @@ -420,8 +420,8 @@ static device_method_t qoriq_gpio_pic_methods[] = { DEVMETHOD(intr_event_post_ithread, qoriq_gpio_pic_post_ithread), DEVMETHOD(intr_event_post_filter, qoriq_gpio_pic_post_filter), - DEVMETHOD(pic_disable_intr, qoriq_gpio_pic_disable_intr), - DEVMETHOD(pic_enable_intr, qoriq_gpio_pic_enable_intr), + DEVMETHOD(pic_disable, qoriq_gpio_pic_disable_intr), + DEVMETHOD(pic_enable, qoriq_gpio_pic_enable_intr), DEVMETHOD(pic_map_intr, qoriq_gpio_pic_map_intr), DEVMETHOD(pic_setup_intr, qoriq_gpio_pic_setup_intr), DEVMETHOD(pic_teardown_intr, qoriq_gpio_pic_teardown_intr), diff --git a/sys/dev/gpio/pl061.c b/sys/dev/gpio/pl061.c index 668cc3f113e1e..7921408dde308 100644 --- a/sys/dev/gpio/pl061.c +++ b/sys/dev/gpio/pl061.c @@ -568,8 +568,8 @@ static device_method_t pl061_methods[] = { DEVMETHOD(gpio_pin_toggle, pl061_pin_toggle), /* Interrupt controller interface */ - DEVMETHOD(pic_disable_intr, pl061_pic_disable_intr), - DEVMETHOD(pic_enable_intr, pl061_pic_enable_intr), + DEVMETHOD(pic_disable, pl061_pic_disable_intr), + DEVMETHOD(pic_enable, pl061_pic_enable_intr), DEVMETHOD(pic_map_intr, pl061_pic_map_intr), DEVMETHOD(pic_setup_intr, pl061_pic_setup_intr), DEVMETHOD(pic_teardown_intr, pl061_pic_teardown_intr), diff --git a/sys/dev/xilinx/xlnx_pcib.c b/sys/dev/xilinx/xlnx_pcib.c index 941f1eaebfd95..0692137512fd2 100644 --- a/sys/dev/xilinx/xlnx_pcib.c +++ b/sys/dev/xilinx/xlnx_pcib.c @@ -772,8 +772,8 @@ static device_method_t xlnx_pcib_fdt_methods[] = { DEVMETHOD(msi_map_msi, xlnx_pcib_msi_map_msi), /* Interrupt controller interface */ - DEVMETHOD(pic_disable_intr, xlnx_pcib_msi_disable_intr), - DEVMETHOD(pic_enable_intr, xlnx_pcib_msi_enable_intr), + DEVMETHOD(pic_disable, xlnx_pcib_msi_disable_intr), + DEVMETHOD(pic_enable, xlnx_pcib_msi_enable_intr), DEVMETHOD(pic_setup_intr, xlnx_pcib_msi_setup_intr), DEVMETHOD(pic_teardown_intr, xlnx_pcib_msi_teardown_intr), diff --git a/sys/kern/pic_if.m b/sys/kern/pic_if.m index 94e54b6a76d16..390a887a06ce6 100644 --- a/sys/kern/pic_if.m +++ b/sys/kern/pic_if.m @@ -108,12 +108,12 @@ struct intr_irqsrc *isrc; } DEFAULT dflt_pic_bind_intr; -METHOD void disable_intr { +METHOD void disable { device_t dev; struct intr_irqsrc *isrc; }; -METHOD void enable_intr { +METHOD void enable { device_t dev; struct intr_irqsrc *isrc; }; diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c index a92eddeadbaaa..a0e10d5580665 100644 --- a/sys/kern/subr_intr.c +++ b/sys/kern/subr_intr.c @@ -1053,7 +1053,7 @@ intr_setup_irq(device_t dev, struct resource *res, driver_filter_t filt, if (error == 0) { isrc->isrc_handlers++; if (isrc->isrc_handlers == 1) - PIC_ENABLE_INTR(isrc->isrc_event.ie_pic, isrc); + PIC_ENABLE(isrc->isrc_event.ie_pic, isrc); } mtx_unlock(&isrc_table_lock); if (error != 0) @@ -1088,7 +1088,7 @@ intr_teardown_irq(device_t dev, struct resource *res, void *cookie) isrc->isrc_filter = NULL; isrc->isrc_arg = NULL; isrc->isrc_handlers = 0; - PIC_DISABLE_INTR(isrc->isrc_event.ie_pic, isrc); + PIC_DISABLE(isrc->isrc_event.ie_pic, isrc); PIC_TEARDOWN_INTR(isrc->isrc_event.ie_pic, isrc, res, data); isrc_update_name(isrc, NULL); mtx_unlock(&isrc_table_lock); @@ -1103,7 +1103,7 @@ intr_teardown_irq(device_t dev, struct resource *res, void *cookie) mtx_lock(&isrc_table_lock); isrc->isrc_handlers--; if (isrc->isrc_handlers == 0) - PIC_DISABLE_INTR(isrc->isrc_event.ie_pic, isrc); + PIC_DISABLE(isrc->isrc_event.ie_pic, isrc); PIC_TEARDOWN_INTR(isrc->isrc_event.ie_pic, isrc, res, data); intrcnt_updatename(isrc); mtx_unlock(&isrc_table_lock); @@ -1820,7 +1820,7 @@ intr_ipi_setup(u_int ipi, const char *name, intr_ipi_handler_t *hand, strlcpy(ii->ii_name, name, INTR_IPI_NAMELEN); ii->ii_count = intr_ipi_setup_counters(name); - PIC_ENABLE_INTR(intr_ipi_dev, isrc); + PIC_ENABLE(intr_ipi_dev, isrc); } void diff --git a/sys/riscv/riscv/aplic.c b/sys/riscv/riscv/aplic.c index 3e8763c62bdc3..7d6ef96444260 100644 --- a/sys/riscv/riscv/aplic.c +++ b/sys/riscv/riscv/aplic.c @@ -50,8 +50,8 @@ /* Smaller priority number means higher priority */ #define APLIC_INTR_DEF_PRIO 1 -static pic_disable_intr_t aplic_disable_intr; -static pic_enable_intr_t aplic_enable_intr; +static pic_disable_t aplic_disable_intr; +static pic_enable_t aplic_enable_intr; static pic_map_intr_t aplic_map_intr; static pic_setup_intr_t aplic_setup_intr; static intr_event_post_ithread_t aplic_post_ithread; @@ -543,8 +543,8 @@ static device_method_t aplic_methods[] = { DEVMETHOD(intr_event_post_ithread, aplic_post_ithread), DEVMETHOD(intr_event_post_filter, aplic_post_ithread), - DEVMETHOD(pic_disable_intr, aplic_disable_intr), - DEVMETHOD(pic_enable_intr, aplic_enable_intr), + DEVMETHOD(pic_disable, aplic_disable_intr), + DEVMETHOD(pic_enable, aplic_enable_intr), DEVMETHOD(pic_map_intr, aplic_map_intr), DEVMETHOD(pic_setup_intr, aplic_setup_intr), DEVMETHOD(pic_bind_intr, aplic_bind_intr), diff --git a/sys/riscv/riscv/intc.c b/sys/riscv/riscv/intc.c index 061b39a22f857..b26aa1c021843 100644 --- a/sys/riscv/riscv/intc.c +++ b/sys/riscv/riscv/intc.c @@ -294,8 +294,8 @@ static device_method_t intc_methods[] = { DEVMETHOD(device_attach, intc_attach), /* Interrupt controller interface */ - DEVMETHOD(pic_disable_intr, intc_disable_intr), - DEVMETHOD(pic_enable_intr, intc_enable_intr), + DEVMETHOD(pic_disable, intc_disable_intr), + DEVMETHOD(pic_enable, intc_enable_intr), DEVMETHOD(pic_map_intr, intc_map_intr), DEVMETHOD(pic_setup_intr, intc_setup_intr), #ifdef SMP diff --git a/sys/riscv/riscv/plic.c b/sys/riscv/riscv/plic.c index 5702c4e539c63..79fb5e61e9055 100644 --- a/sys/riscv/riscv/plic.c +++ b/sys/riscv/riscv/plic.c @@ -71,8 +71,8 @@ #define PLIC_CLAIM(sc, h) \ (sc->contexts[h].context_offset + PLIC_CONTEXT_CLAIM) -static pic_disable_intr_t plic_disable_intr; -static pic_enable_intr_t plic_enable_intr; +static pic_disable_t plic_disable_intr; +static pic_enable_t plic_enable_intr; static pic_map_intr_t plic_map_intr; static pic_setup_intr_t plic_setup_intr; static intr_event_post_ithread_t plic_post_ithread; @@ -484,8 +484,8 @@ static device_method_t plic_methods[] = { DEVMETHOD(intr_event_post_ithread, plic_post_ithread), DEVMETHOD(intr_event_post_filter, plic_post_ithread), - DEVMETHOD(pic_disable_intr, plic_disable_intr), - DEVMETHOD(pic_enable_intr, plic_enable_intr), + DEVMETHOD(pic_disable, plic_disable_intr), + DEVMETHOD(pic_enable, plic_enable_intr), DEVMETHOD(pic_map_intr, plic_map_intr), DEVMETHOD(pic_setup_intr, plic_setup_intr), DEVMETHOD(pic_bind_intr, plic_bind_intr),