Skip to content

Commit 0e2213f

Browse files
jhovoldKAGA-KOKO
authored andcommitted
irqchip: Use irq_domain_alloc_irqs()
Use the irq_domain_alloc_irqs() wrapper instead of the full __irq_domain_alloc_irqs() interface, which was only intended for some legacy (x86) use cases. Signed-off-by: Johan Hovold <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 379af13 commit 0e2213f

File tree

6 files changed

+8
-21
lines changed

6 files changed

+8
-21
lines changed

drivers/irqchip/irq-apple-aic.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -924,9 +924,7 @@ static int __init aic_init_smp(struct aic_irq_chip *irqc, struct device_node *no
924924
ipi_domain->flags |= IRQ_DOMAIN_FLAG_IPI_SINGLE;
925925
irq_domain_update_bus_token(ipi_domain, DOMAIN_BUS_IPI);
926926

927-
base_ipi = __irq_domain_alloc_irqs(ipi_domain, -1, AIC_NR_SWIPI,
928-
NUMA_NO_NODE, NULL, false, NULL);
929-
927+
base_ipi = irq_domain_alloc_irqs(ipi_domain, AIC_NR_SWIPI, NUMA_NO_NODE, NULL);
930928
if (WARN_ON(!base_ipi)) {
931929
irq_domain_remove(ipi_domain);
932930
return -ENODEV;

drivers/irqchip/irq-armada-370-xp.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,8 +454,7 @@ static __init void armada_xp_ipi_init(struct device_node *node)
454454
return;
455455

456456
irq_domain_update_bus_token(ipi_domain, DOMAIN_BUS_IPI);
457-
base_ipi = __irq_domain_alloc_irqs(ipi_domain, -1, IPI_DOORBELL_END,
458-
NUMA_NO_NODE, NULL, false, NULL);
457+
base_ipi = irq_domain_alloc_irqs(ipi_domain, IPI_DOORBELL_END, NUMA_NO_NODE, NULL);
459458
if (WARN_ON(!base_ipi))
460459
return;
461460

drivers/irqchip/irq-bcm2836.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,7 @@ static void __init bcm2836_arm_irqchip_smp_init(void)
268268
ipi_domain->flags |= IRQ_DOMAIN_FLAG_IPI_SINGLE;
269269
irq_domain_update_bus_token(ipi_domain, DOMAIN_BUS_IPI);
270270

271-
base_ipi = __irq_domain_alloc_irqs(ipi_domain, -1, BITS_PER_MBOX,
272-
NUMA_NO_NODE, NULL,
273-
false, NULL);
274-
271+
base_ipi = irq_domain_alloc_irqs(ipi_domain, BITS_PER_MBOX, NUMA_NO_NODE, NULL);
275272
if (WARN_ON(!base_ipi))
276273
return;
277274

drivers/irqchip/irq-gic-v3.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,9 +1310,7 @@ static void __init gic_smp_init(void)
13101310
gic_starting_cpu, NULL);
13111311

13121312
/* Register all 8 non-secure SGIs */
1313-
base_sgi = __irq_domain_alloc_irqs(gic_data.domain, -1, 8,
1314-
NUMA_NO_NODE, &sgi_fwspec,
1315-
false, NULL);
1313+
base_sgi = irq_domain_alloc_irqs(gic_data.domain, 8, NUMA_NO_NODE, &sgi_fwspec);
13161314
if (WARN_ON(base_sgi <= 0))
13171315
return;
13181316

drivers/irqchip/irq-gic-v4.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,7 @@ static int its_alloc_vcpu_sgis(struct its_vpe *vpe, int idx)
139139
if (!vpe->sgi_domain)
140140
goto err;
141141

142-
sgi_base = __irq_domain_alloc_irqs(vpe->sgi_domain, -1, 16,
143-
NUMA_NO_NODE, vpe,
144-
false, NULL);
142+
sgi_base = irq_domain_alloc_irqs(vpe->sgi_domain, 16, NUMA_NO_NODE, vpe);
145143
if (sgi_base <= 0)
146144
goto err;
147145

@@ -176,9 +174,8 @@ int its_alloc_vcpu_irqs(struct its_vm *vm)
176174
vm->vpes[i]->idai = true;
177175
}
178176

179-
vpe_base_irq = __irq_domain_alloc_irqs(vm->domain, -1, vm->nr_vpes,
180-
NUMA_NO_NODE, vm,
181-
false, NULL);
177+
vpe_base_irq = irq_domain_alloc_irqs(vm->domain, vm->nr_vpes,
178+
NUMA_NO_NODE, vm);
182179
if (vpe_base_irq <= 0)
183180
goto err;
184181

drivers/irqchip/irq-gic.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -868,9 +868,7 @@ static __init void gic_smp_init(void)
868868
"irqchip/arm/gic:starting",
869869
gic_starting_cpu, NULL);
870870

871-
base_sgi = __irq_domain_alloc_irqs(gic_data[0].domain, -1, 8,
872-
NUMA_NO_NODE, &sgi_fwspec,
873-
false, NULL);
871+
base_sgi = irq_domain_alloc_irqs(gic_data[0].domain, 8, NUMA_NO_NODE, &sgi_fwspec);
874872
if (WARN_ON(base_sgi <= 0))
875873
return;
876874

0 commit comments

Comments
 (0)