Skip to content

Commit 8398309

Browse files
ehemehem
committed
intrng: rename pic_{disable,enable}_intr() to pic_{disable,enable}()
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.
1 parent 6c2175a commit 8398309

31 files changed

+82
-82
lines changed

‎sys/arm/allwinner/a10/a10_intc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,8 @@ static device_method_t a10_aintc_methods[] = {
372372
DEVMETHOD(intr_event_post_filter, a10_intr_post_filter),
373373

374374
/* Interrupt controller interface */
375-
DEVMETHOD(pic_disable_intr, a10_intr_disable_intr),
376-
DEVMETHOD(pic_enable_intr, a10_intr_enable_intr),
375+
DEVMETHOD(pic_disable, a10_intr_disable_intr),
376+
DEVMETHOD(pic_enable, a10_intr_enable_intr),
377377
DEVMETHOD(pic_map_intr, a10_intr_map_intr),
378378

379379
DEVMETHOD_END

‎sys/arm/allwinner/aw_gpio.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1458,8 +1458,8 @@ static device_method_t aw_gpio_methods[] = {
14581458
DEVMETHOD(intr_event_post_filter, aw_gpio_pic_post_filter),
14591459

14601460
/* Interrupt controller interface */
1461-
DEVMETHOD(pic_disable_intr, aw_gpio_pic_disable_intr),
1462-
DEVMETHOD(pic_enable_intr, aw_gpio_pic_enable_intr),
1461+
DEVMETHOD(pic_disable, aw_gpio_pic_disable_intr),
1462+
DEVMETHOD(pic_enable, aw_gpio_pic_enable_intr),
14631463
DEVMETHOD(pic_map_intr, aw_gpio_pic_map_intr),
14641464
DEVMETHOD(pic_setup_intr, aw_gpio_pic_setup_intr),
14651465
DEVMETHOD(pic_teardown_intr, aw_gpio_pic_teardown_intr),

‎sys/arm/allwinner/aw_nmi.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,8 @@ static device_method_t aw_nmi_methods[] = {
399399
DEVMETHOD(intr_event_post_filter, aw_nmi_post_filter),
400400

401401
/* Interrupt controller interface */
402-
DEVMETHOD(pic_disable_intr, aw_nmi_disable_intr),
403-
DEVMETHOD(pic_enable_intr, aw_nmi_enable_intr),
402+
DEVMETHOD(pic_disable, aw_nmi_disable_intr),
403+
DEVMETHOD(pic_enable, aw_nmi_enable_intr),
404404
DEVMETHOD(pic_map_intr, aw_nmi_map_intr),
405405
DEVMETHOD(pic_setup_intr, aw_nmi_setup_intr),
406406
DEVMETHOD(pic_teardown_intr, aw_nmi_teardown_intr),

‎sys/arm/allwinner/aw_r_intc.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ aw_r_intc_gicp_enable_intr(device_t dev, struct intr_irqsrc *isrc)
159159

160160
sc = device_get_softc(dev);
161161

162-
PIC_ENABLE_INTR(sc->parent, isrc);
162+
PIC_ENABLE(sc->parent, isrc);
163163
}
164164

165165
static void
@@ -169,7 +169,7 @@ aw_r_intc_gicp_disable_intr(device_t dev, struct intr_irqsrc *isrc)
169169

170170
sc = device_get_softc(dev);
171171

172-
PIC_DISABLE_INTR(sc->parent, isrc);
172+
PIC_DISABLE(sc->parent, isrc);
173173
}
174174

175175
static int
@@ -279,8 +279,8 @@ static device_method_t aw_r_intc_gicp_methods[] = {
279279

280280
/* Interrupt controller interface */
281281
DEVMETHOD(pic_activate_intr, aw_r_intc_gicp_activate_intr),
282-
DEVMETHOD(pic_disable_intr, aw_r_intc_gicp_disable_intr),
283-
DEVMETHOD(pic_enable_intr, aw_r_intc_gicp_enable_intr),
282+
DEVMETHOD(pic_disable, aw_r_intc_gicp_disable_intr),
283+
DEVMETHOD(pic_enable, aw_r_intc_gicp_enable_intr),
284284
DEVMETHOD(pic_map_intr, aw_r_intc_gicp_map_intr),
285285
DEVMETHOD(pic_deactivate_intr, aw_r_intc_gicp_deactivate_intr),
286286
DEVMETHOD(pic_setup_intr, aw_r_intc_gicp_setup_intr),

‎sys/arm/arm/gic.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1230,8 +1230,8 @@ static device_method_t arm_gic_methods[] = {
12301230
DEVMETHOD(intr_event_post_filter, arm_gic_post_filter),
12311231

12321232
/* Interrupt controller interface */
1233-
DEVMETHOD(pic_disable_intr, arm_gic_disable_intr),
1234-
DEVMETHOD(pic_enable_intr, arm_gic_enable_intr),
1233+
DEVMETHOD(pic_disable, arm_gic_disable_intr),
1234+
DEVMETHOD(pic_enable, arm_gic_enable_intr),
12351235
DEVMETHOD(pic_map_intr, arm_gic_map_intr),
12361236
DEVMETHOD(pic_setup_intr, arm_gic_setup_intr),
12371237
DEVMETHOD(pic_teardown_intr, arm_gic_teardown_intr),

‎sys/arm/broadcom/bcm2835/bcm2835_gpio.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1336,8 +1336,8 @@ static device_method_t bcm_gpio_methods[] = {
13361336
DEVMETHOD(intr_event_post_filter, bcm_gpio_pic_post_filter),
13371337

13381338
/* Interrupt controller interface */
1339-
DEVMETHOD(pic_disable_intr, bcm_gpio_pic_disable_intr),
1340-
DEVMETHOD(pic_enable_intr, bcm_gpio_pic_enable_intr),
1339+
DEVMETHOD(pic_disable, bcm_gpio_pic_disable_intr),
1340+
DEVMETHOD(pic_enable, bcm_gpio_pic_enable_intr),
13411341
DEVMETHOD(pic_map_intr, bcm_gpio_pic_map_intr),
13421342
DEVMETHOD(pic_setup_intr, bcm_gpio_pic_setup_intr),
13431343
DEVMETHOD(pic_teardown_intr, bcm_gpio_pic_teardown_intr),

‎sys/arm/broadcom/bcm2835/bcm2835_intr.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,8 @@ static device_method_t bcm_intc_methods[] = {
436436
DEVMETHOD(intr_event_post_ithread, bcm_intc_post_ithread),
437437
DEVMETHOD(intr_event_post_filter, bcm_intc_post_filter),
438438

439-
DEVMETHOD(pic_disable_intr, bcm_intc_disable_intr),
440-
DEVMETHOD(pic_enable_intr, bcm_intc_enable_intr),
439+
DEVMETHOD(pic_disable, bcm_intc_disable_intr),
440+
DEVMETHOD(pic_enable, bcm_intc_enable_intr),
441441
DEVMETHOD(pic_map_intr, bcm_intc_map_intr),
442442

443443
DEVMETHOD_END

‎sys/arm/broadcom/bcm2835/bcm2836.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -731,8 +731,8 @@ static device_method_t bcm_lintc_methods[] = {
731731
DEVMETHOD(intr_event_post_ithread, bcm_lintc_post_ithread),
732732
DEVMETHOD(intr_event_post_filter, bcm_lintc_post_filter),
733733

734-
DEVMETHOD(pic_disable_intr, bcm_lintc_disable_intr),
735-
DEVMETHOD(pic_enable_intr, bcm_lintc_enable_intr),
734+
DEVMETHOD(pic_disable, bcm_lintc_disable_intr),
735+
DEVMETHOD(pic_enable, bcm_lintc_enable_intr),
736736
DEVMETHOD(pic_map_intr, bcm_lintc_map_intr),
737737
DEVMETHOD(pic_setup_intr, bcm_lintc_setup_intr),
738738
#ifdef SMP

‎sys/arm/freescale/imx/imx_gpio.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -923,8 +923,8 @@ static device_method_t imx51_gpio_methods[] = {
923923

924924
#ifdef INTRNG
925925
/* Interrupt controller interface */
926-
DEVMETHOD(pic_disable_intr, gpio_pic_disable_intr),
927-
DEVMETHOD(pic_enable_intr, gpio_pic_enable_intr),
926+
DEVMETHOD(pic_disable, gpio_pic_disable_intr),
927+
DEVMETHOD(pic_enable, gpio_pic_enable_intr),
928928
DEVMETHOD(pic_map_intr, gpio_pic_map_intr),
929929
DEVMETHOD(pic_setup_intr, gpio_pic_setup_intr),
930930
DEVMETHOD(pic_teardown_intr, gpio_pic_teardown_intr),

‎sys/arm/mv/mpic.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,8 @@ static device_method_t mv_mpic_methods[] = {
382382
DEVMETHOD(intr_event_post_ithread, mpic_post_ithread),
383383
DEVMETHOD(intr_event_post_filter, mpic_post_filter),
384384

385-
DEVMETHOD(pic_disable_intr, mpic_disable_intr),
386-
DEVMETHOD(pic_enable_intr, mpic_enable_intr),
385+
DEVMETHOD(pic_disable, mpic_disable_intr),
386+
DEVMETHOD(pic_enable, mpic_enable_intr),
387387
DEVMETHOD(pic_map_intr, mpic_map_intr),
388388
DEVMETHOD(pic_ipi_send, mpic_ipi_send),
389389

‎sys/arm/mv/mv_ap806_gicp.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ mv_ap806_gicp_enable_intr(device_t dev, struct intr_irqsrc *isrc)
239239

240240
sc = device_get_softc(dev);
241241

242-
PIC_ENABLE_INTR(sc->parent, isrc);
242+
PIC_ENABLE(sc->parent, isrc);
243243
}
244244

245245
static void
@@ -249,7 +249,7 @@ mv_ap806_gicp_disable_intr(device_t dev, struct intr_irqsrc *isrc)
249249

250250
sc = device_get_softc(dev);
251251

252-
PIC_DISABLE_INTR(sc->parent, isrc);
252+
PIC_DISABLE(sc->parent, isrc);
253253
}
254254

255255
static int
@@ -424,8 +424,8 @@ static device_method_t mv_ap806_gicp_methods[] = {
424424

425425
/* Interrupt controller interface */
426426
DEVMETHOD(pic_activate_intr, mv_ap806_gicp_activate_intr),
427-
DEVMETHOD(pic_disable_intr, mv_ap806_gicp_disable_intr),
428-
DEVMETHOD(pic_enable_intr, mv_ap806_gicp_enable_intr),
427+
DEVMETHOD(pic_disable, mv_ap806_gicp_disable_intr),
428+
DEVMETHOD(pic_enable, mv_ap806_gicp_enable_intr),
429429
DEVMETHOD(pic_map_intr, mv_ap806_gicp_map_intr),
430430
DEVMETHOD(pic_deactivate_intr, mv_ap806_gicp_deactivate_intr),
431431
DEVMETHOD(pic_setup_intr, mv_ap806_gicp_setup_intr),

‎sys/arm/mv/mv_ap806_sei.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -483,8 +483,8 @@ static device_method_t mv_ap806_sei_methods[] = {
483483
DEVMETHOD(intr_event_post_filter, mv_ap806_sei_post_filter),
484484

485485
/* Interrupt controller interface */
486-
DEVMETHOD(pic_disable_intr, mv_ap806_sei_disable_intr),
487-
DEVMETHOD(pic_enable_intr, mv_ap806_sei_enable_intr),
486+
DEVMETHOD(pic_disable, mv_ap806_sei_disable_intr),
487+
DEVMETHOD(pic_enable, mv_ap806_sei_enable_intr),
488488
DEVMETHOD(pic_map_intr, mv_ap806_sei_map_intr),
489489
DEVMETHOD(pic_setup_intr, mv_ap806_sei_setup_intr),
490490
DEVMETHOD(pic_teardown_intr, mv_ap806_sei_teardown_intr),

‎sys/arm/mv/mv_cp110_icu.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ mv_cp110_icu_enable_intr(device_t dev, struct intr_irqsrc *isrc)
224224
struct mv_cp110_icu_softc *sc;
225225
sc = device_get_softc(dev);
226226

227-
PIC_ENABLE_INTR(sc->parent, isrc);
227+
PIC_ENABLE(sc->parent, isrc);
228228
}
229229

230230
static void
@@ -234,7 +234,7 @@ mv_cp110_icu_disable_intr(device_t dev, struct intr_irqsrc *isrc)
234234

235235
sc = device_get_softc(dev);
236236

237-
PIC_DISABLE_INTR(sc->parent, isrc);
237+
PIC_DISABLE(sc->parent, isrc);
238238
}
239239

240240
static void
@@ -442,8 +442,8 @@ static device_method_t mv_cp110_icu_methods[] = {
442442

443443
/* Interrupt controller interface */
444444
DEVMETHOD(pic_activate_intr, mv_cp110_icu_activate_intr),
445-
DEVMETHOD(pic_disable_intr, mv_cp110_icu_disable_intr),
446-
DEVMETHOD(pic_enable_intr, mv_cp110_icu_enable_intr),
445+
DEVMETHOD(pic_disable, mv_cp110_icu_disable_intr),
446+
DEVMETHOD(pic_enable, mv_cp110_icu_enable_intr),
447447
DEVMETHOD(pic_map_intr, mv_cp110_icu_map_intr),
448448
DEVMETHOD(pic_deactivate_intr, mv_cp110_icu_deactivate_intr),
449449
DEVMETHOD(pic_setup_intr, mv_cp110_icu_setup_intr),

‎sys/arm/mv/mvebu_gpio.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -844,8 +844,8 @@ static device_method_t mvebu_gpio_methods[] = {
844844
DEVMETHOD(intr_event_post_filter, mvebu_gpio_pic_post_filter),
845845

846846
/* Interrupt controller interface */
847-
DEVMETHOD(pic_disable_intr, mvebu_gpio_pic_disable_intr),
848-
DEVMETHOD(pic_enable_intr, mvebu_gpio_pic_enable_intr),
847+
DEVMETHOD(pic_disable, mvebu_gpio_pic_disable_intr),
848+
DEVMETHOD(pic_enable, mvebu_gpio_pic_enable_intr),
849849
DEVMETHOD(pic_map_intr, mvebu_gpio_pic_map_intr),
850850
DEVMETHOD(pic_setup_intr, mvebu_gpio_pic_setup_intr),
851851
DEVMETHOD(pic_teardown_intr, mvebu_gpio_pic_teardown_intr),

‎sys/arm/nvidia/tegra_gpio.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -858,8 +858,8 @@ static device_method_t tegra_gpio_methods[] = {
858858
DEVMETHOD(intr_event_post_filter, tegra_gpio_pic_post_filter),
859859

860860
/* Interrupt controller interface */
861-
DEVMETHOD(pic_disable_intr, tegra_gpio_pic_disable_intr),
862-
DEVMETHOD(pic_enable_intr, tegra_gpio_pic_enable_intr),
861+
DEVMETHOD(pic_disable, tegra_gpio_pic_disable_intr),
862+
DEVMETHOD(pic_enable, tegra_gpio_pic_enable_intr),
863863
DEVMETHOD(pic_map_intr, tegra_gpio_pic_map_intr),
864864
DEVMETHOD(pic_setup_intr, tegra_gpio_pic_setup_intr),
865865
DEVMETHOD(pic_teardown_intr, tegra_gpio_pic_teardown_intr),

‎sys/arm/nvidia/tegra_lic.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,15 @@ tegra_lic_disable_intr(device_t dev, struct intr_irqsrc *isrc)
100100
{
101101
struct tegra_lic_sc *sc = device_get_softc(dev);
102102

103-
PIC_DISABLE_INTR(sc->parent, isrc);
103+
PIC_DISABLE(sc->parent, isrc);
104104
}
105105

106106
static void
107107
tegra_lic_enable_intr(device_t dev, struct intr_irqsrc *isrc)
108108
{
109109
struct tegra_lic_sc *sc = device_get_softc(dev);
110110

111-
PIC_ENABLE_INTR(sc->parent, isrc);
111+
PIC_ENABLE(sc->parent, isrc);
112112
}
113113

114114
static int
@@ -269,8 +269,8 @@ static device_method_t tegra_lic_methods[] = {
269269

270270
/* Interrupt controller interface */
271271
DEVMETHOD(pic_activate_intr, tegra_lic_activate_intr),
272-
DEVMETHOD(pic_disable_intr, tegra_lic_disable_intr),
273-
DEVMETHOD(pic_enable_intr, tegra_lic_enable_intr),
272+
DEVMETHOD(pic_disable, tegra_lic_disable_intr),
273+
DEVMETHOD(pic_enable, tegra_lic_enable_intr),
274274
DEVMETHOD(pic_map_intr, tegra_lic_map_intr),
275275
DEVMETHOD(pic_deactivate_intr, tegra_lic_deactivate_intr),
276276
DEVMETHOD(pic_setup_intr, tegra_lic_setup_intr),

‎sys/arm/nvidia/tegra_pcie.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1605,8 +1605,8 @@ static device_method_t tegra_pcib_methods[] = {
16051605
DEVMETHOD(msi_map_msi, tegra_pcib_msi_map_msi),
16061606

16071607
/* Interrupt controller interface */
1608-
DEVMETHOD(pic_disable_intr, tegra_pcib_msi_disable_intr),
1609-
DEVMETHOD(pic_enable_intr, tegra_pcib_msi_enable_intr),
1608+
DEVMETHOD(pic_disable, tegra_pcib_msi_disable_intr),
1609+
DEVMETHOD(pic_enable, tegra_pcib_msi_enable_intr),
16101610
DEVMETHOD(pic_setup_intr, tegra_pcib_msi_setup_intr),
16111611
DEVMETHOD(pic_teardown_intr, tegra_pcib_msi_teardown_intr),
16121612
#endif

‎sys/arm/ti/aintc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@ static device_method_t ti_aintc_methods[] = {
291291
DEVMETHOD(intr_event_post_ithread, ti_aintc_post_ithread),
292292
DEVMETHOD(intr_event_post_filter, ti_aintc_post_filter),
293293

294-
DEVMETHOD(pic_disable_intr, ti_aintc_disable_intr),
295-
DEVMETHOD(pic_enable_intr, ti_aintc_enable_intr),
294+
DEVMETHOD(pic_disable, ti_aintc_disable_intr),
295+
DEVMETHOD(pic_enable, ti_aintc_enable_intr),
296296
DEVMETHOD(pic_map_intr, ti_aintc_map_intr),
297297

298298
DEVMETHOD_END

‎sys/arm/ti/omap4/omap4_wugen.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ static device_method_t omap4_wugen_methods[] = {
229229

230230
/* Interrupt controller interface */
231231
DEVMETHOD(pic_activate_intr, omap4_wugen_activate_intr),
232-
DEVMETHOD(pic_disable_intr, omap4_wugen_disable_intr),
233-
DEVMETHOD(pic_enable_intr, omap4_wugen_enable_intr),
232+
DEVMETHOD(pic_disable, omap4_wugen_disable_intr),
233+
DEVMETHOD(pic_enable, omap4_wugen_enable_intr),
234234
DEVMETHOD(pic_map_intr, omap4_wugen_map_intr),
235235
DEVMETHOD(pic_deactivate_intr, omap4_wugen_deactivate_intr),
236236
DEVMETHOD(pic_setup_intr, omap4_wugen_setup_intr),

‎sys/arm/ti/ti_gpio.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1106,8 +1106,8 @@ static device_method_t ti_gpio_methods[] = {
11061106
DEVMETHOD(gpio_pin_toggle, ti_gpio_pin_toggle),
11071107

11081108
/* Interrupt controller interface */
1109-
DEVMETHOD(pic_disable_intr, ti_gpio_pic_disable_intr),
1110-
DEVMETHOD(pic_enable_intr, ti_gpio_pic_enable_intr),
1109+
DEVMETHOD(pic_disable, ti_gpio_pic_disable_intr),
1110+
DEVMETHOD(pic_enable, ti_gpio_pic_enable_intr),
11111111
DEVMETHOD(pic_map_intr, ti_gpio_pic_map_intr),
11121112
DEVMETHOD(pic_setup_intr, ti_gpio_pic_setup_intr),
11131113
DEVMETHOD(pic_teardown_intr, ti_gpio_pic_teardown_intr),

‎sys/arm64/arm64/gic_v3.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ static bus_read_ivar_t gic_v3_read_ivar;
7979
static bus_write_ivar_t gic_v3_write_ivar;
8080
static bus_alloc_resource_t gic_v3_alloc_resource;
8181

82-
static pic_disable_intr_t gic_v3_disable_intr;
83-
static pic_enable_intr_t gic_v3_enable_intr;
82+
static pic_disable_t gic_v3_disable_intr;
83+
static pic_enable_t gic_v3_enable_intr;
8484
static pic_map_intr_t gic_v3_map_intr;
8585
static pic_setup_intr_t gic_v3_setup_intr;
8686
static pic_teardown_intr_t gic_v3_teardown_intr;
@@ -130,8 +130,8 @@ static device_method_t gic_v3_methods[] = {
130130
DEVMETHOD(intr_event_post_filter, gic_v3_post_filter),
131131

132132
/* Interrupt controller interface */
133-
DEVMETHOD(pic_disable_intr, gic_v3_disable_intr),
134-
DEVMETHOD(pic_enable_intr, gic_v3_enable_intr),
133+
DEVMETHOD(pic_disable, gic_v3_disable_intr),
134+
DEVMETHOD(pic_enable, gic_v3_enable_intr),
135135
DEVMETHOD(pic_map_intr, gic_v3_map_intr),
136136
DEVMETHOD(pic_setup_intr, gic_v3_setup_intr),
137137
DEVMETHOD(pic_teardown_intr, gic_v3_teardown_intr),

‎sys/arm64/arm64/gicv3_its.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,8 @@ static const struct {
324324
static device_attach_t gicv3_its_attach;
325325
static device_detach_t gicv3_its_detach;
326326

327-
static pic_disable_intr_t gicv3_its_disable_intr;
328-
static pic_enable_intr_t gicv3_its_enable_intr;
327+
static pic_disable_t gicv3_its_disable_intr;
328+
static pic_enable_t gicv3_its_enable_intr;
329329
static pic_map_intr_t gicv3_its_map_intr;
330330
static pic_setup_intr_t gicv3_its_setup_intr;
331331
static intr_event_post_filter_t gicv3_its_post_filter;
@@ -362,8 +362,8 @@ static device_method_t gicv3_its_methods[] = {
362362
DEVMETHOD(intr_event_post_filter, gicv3_its_post_filter),
363363

364364
/* Interrupt controller interface */
365-
DEVMETHOD(pic_disable_intr, gicv3_its_disable_intr),
366-
DEVMETHOD(pic_enable_intr, gicv3_its_enable_intr),
365+
DEVMETHOD(pic_disable, gicv3_its_disable_intr),
366+
DEVMETHOD(pic_enable, gicv3_its_enable_intr),
367367
DEVMETHOD(pic_map_intr, gicv3_its_map_intr),
368368
DEVMETHOD(pic_setup_intr, gicv3_its_setup_intr),
369369
#ifdef SMP

‎sys/arm64/freescale/imx/imx7gpc.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ imx7gpc_disable_intr(device_t dev, struct intr_irqsrc *isrc)
7070
{
7171
struct imx7gpc_softc *sc = device_get_softc(dev);
7272

73-
PIC_DISABLE_INTR(sc->parent, isrc);
73+
PIC_DISABLE(sc->parent, isrc);
7474
}
7575

7676
static void
7777
imx7gpc_enable_intr(device_t dev, struct intr_irqsrc *isrc)
7878
{
7979
struct imx7gpc_softc *sc = device_get_softc(dev);
8080

81-
PIC_ENABLE_INTR(sc->parent, isrc);
81+
PIC_ENABLE(sc->parent, isrc);
8282
}
8383

8484
static int
@@ -219,8 +219,8 @@ static device_method_t imx7gpc_methods[] = {
219219

220220
/* Interrupt controller interface */
221221
DEVMETHOD(pic_activate_intr, imx7gpc_activate_intr),
222-
DEVMETHOD(pic_disable_intr, imx7gpc_disable_intr),
223-
DEVMETHOD(pic_enable_intr, imx7gpc_enable_intr),
222+
DEVMETHOD(pic_disable, imx7gpc_disable_intr),
223+
DEVMETHOD(pic_enable, imx7gpc_enable_intr),
224224
DEVMETHOD(pic_map_intr, imx7gpc_map_intr),
225225
DEVMETHOD(pic_deactivate_intr, imx7gpc_deactivate_intr),
226226
DEVMETHOD(pic_setup_intr, imx7gpc_setup_intr),

‎sys/arm64/qoriq/qoriq_gpio_pic.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,8 @@ static device_method_t qoriq_gpio_pic_methods[] = {
420420
DEVMETHOD(intr_event_post_ithread, qoriq_gpio_pic_post_ithread),
421421
DEVMETHOD(intr_event_post_filter, qoriq_gpio_pic_post_filter),
422422

423-
DEVMETHOD(pic_disable_intr, qoriq_gpio_pic_disable_intr),
424-
DEVMETHOD(pic_enable_intr, qoriq_gpio_pic_enable_intr),
423+
DEVMETHOD(pic_disable, qoriq_gpio_pic_disable_intr),
424+
DEVMETHOD(pic_enable, qoriq_gpio_pic_enable_intr),
425425
DEVMETHOD(pic_map_intr, qoriq_gpio_pic_map_intr),
426426
DEVMETHOD(pic_setup_intr, qoriq_gpio_pic_setup_intr),
427427
DEVMETHOD(pic_teardown_intr, qoriq_gpio_pic_teardown_intr),

‎sys/dev/gpio/pl061.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -568,8 +568,8 @@ static device_method_t pl061_methods[] = {
568568
DEVMETHOD(gpio_pin_toggle, pl061_pin_toggle),
569569

570570
/* Interrupt controller interface */
571-
DEVMETHOD(pic_disable_intr, pl061_pic_disable_intr),
572-
DEVMETHOD(pic_enable_intr, pl061_pic_enable_intr),
571+
DEVMETHOD(pic_disable, pl061_pic_disable_intr),
572+
DEVMETHOD(pic_enable, pl061_pic_enable_intr),
573573
DEVMETHOD(pic_map_intr, pl061_pic_map_intr),
574574
DEVMETHOD(pic_setup_intr, pl061_pic_setup_intr),
575575
DEVMETHOD(pic_teardown_intr, pl061_pic_teardown_intr),

‎sys/dev/xilinx/xlnx_pcib.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -772,8 +772,8 @@ static device_method_t xlnx_pcib_fdt_methods[] = {
772772
DEVMETHOD(msi_map_msi, xlnx_pcib_msi_map_msi),
773773

774774
/* Interrupt controller interface */
775-
DEVMETHOD(pic_disable_intr, xlnx_pcib_msi_disable_intr),
776-
DEVMETHOD(pic_enable_intr, xlnx_pcib_msi_enable_intr),
775+
DEVMETHOD(pic_disable, xlnx_pcib_msi_disable_intr),
776+
DEVMETHOD(pic_enable, xlnx_pcib_msi_enable_intr),
777777
DEVMETHOD(pic_setup_intr, xlnx_pcib_msi_setup_intr),
778778
DEVMETHOD(pic_teardown_intr, xlnx_pcib_msi_teardown_intr),
779779

0 commit comments

Comments
 (0)