intrng: rename pic_{disable,enable}_intr() to pic_{disable,enable}()

ehem · ehem · commit 83983099405b · 2024-11-01T10:48:25.000-07:00
This matches PowerPC which has had similar functions rather longer.
This also works cooperates with x86 which uses an identically named
function for a subset of the functionality.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -100,15 +100,15 @@ 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
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -70,15 +70,15 @@ 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
 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
@@ -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
@@ -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
@@ -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
diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c
diff --git a/sys/riscv/riscv/aplic.c b/sys/riscv/riscv/aplic.c
diff --git a/sys/riscv/riscv/intc.c b/sys/riscv/riscv/intc.c
diff --git a/sys/riscv/riscv/plic.c b/sys/riscv/riscv/plic.c
