Commit 0e2213fe authored by Johan Hovold's avatar Johan Hovold Committed by Thomas Gleixner
Browse files

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: default avatarJohan Hovold <johan+linaro@kernel.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20221213140844.15470-2-johan+linaro@kernel.org
parent 379af13b

drivers/irqchip/irq-apple-aic.c

+1 −3
Original line number Diff line number Diff line
@@ -924,9 +924,7 @@ static int __init aic_init_smp(struct aic_irq_chip *irqc, struct device_node *no 
	ipi_domain->flags |= IRQ_DOMAIN_FLAG_IPI_SINGLE;

	irq_domain_update_bus_token(ipi_domain, DOMAIN_BUS_IPI);



	base_ipi = __irq_domain_alloc_irqs(ipi_domain, -1, AIC_NR_SWIPI,

					   NUMA_NO_NODE, NULL, false, NULL);



	base_ipi = irq_domain_alloc_irqs(ipi_domain, AIC_NR_SWIPI, NUMA_NO_NODE, NULL);

	if (WARN_ON(!base_ipi)) {

		irq_domain_remove(ipi_domain);

		return -ENODEV;

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

+1 −2
Original line number Diff line number Diff line
@@ -454,8 +454,7 @@ static __init void armada_xp_ipi_init(struct device_node *node) 
		return;



	irq_domain_update_bus_token(ipi_domain, DOMAIN_BUS_IPI);

	base_ipi = __irq_domain_alloc_irqs(ipi_domain, -1, IPI_DOORBELL_END,

					   NUMA_NO_NODE, NULL, false, NULL);

	base_ipi = irq_domain_alloc_irqs(ipi_domain, IPI_DOORBELL_END, NUMA_NO_NODE, NULL);

	if (WARN_ON(!base_ipi))

		return;

drivers/irqchip/irq-bcm2836.c

+1 −4
Original line number Diff line number Diff line
@@ -268,10 +268,7 @@ static void __init bcm2836_arm_irqchip_smp_init(void) 
	ipi_domain->flags |= IRQ_DOMAIN_FLAG_IPI_SINGLE;

	irq_domain_update_bus_token(ipi_domain, DOMAIN_BUS_IPI);



	base_ipi = __irq_domain_alloc_irqs(ipi_domain, -1, BITS_PER_MBOX,

					   NUMA_NO_NODE, NULL,

					   false, NULL);



	base_ipi = irq_domain_alloc_irqs(ipi_domain, BITS_PER_MBOX, NUMA_NO_NODE, NULL);

	if (WARN_ON(!base_ipi))

		return;

drivers/irqchip/irq-gic-v3.c

+1 −3
Original line number Diff line number Diff line
@@ -1310,9 +1310,7 @@ static void __init gic_smp_init(void) 
				  gic_starting_cpu, NULL);



	/* Register all 8 non-secure SGIs */

	base_sgi = __irq_domain_alloc_irqs(gic_data.domain, -1, 8,

					   NUMA_NO_NODE, &sgi_fwspec,

					   false, NULL);

	base_sgi = irq_domain_alloc_irqs(gic_data.domain, 8, NUMA_NO_NODE, &sgi_fwspec);

	if (WARN_ON(base_sgi <= 0))

		return;

drivers/irqchip/irq-gic-v4.c

+3 −6
Original line number Diff line number Diff line
@@ -139,9 +139,7 @@ static int its_alloc_vcpu_sgis(struct its_vpe *vpe, int idx) 
	if (!vpe->sgi_domain)

		goto err;



	sgi_base = __irq_domain_alloc_irqs(vpe->sgi_domain, -1, 16,

					       NUMA_NO_NODE, vpe,

					       false, NULL);

	sgi_base = irq_domain_alloc_irqs(vpe->sgi_domain, 16, NUMA_NO_NODE, vpe);

	if (sgi_base <= 0)

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

	}



	vpe_base_irq = __irq_domain_alloc_irqs(vm->domain, -1, vm->nr_vpes,

					       NUMA_NO_NODE, vm,

					       false, NULL);

	vpe_base_irq = irq_domain_alloc_irqs(vm->domain, vm->nr_vpes,

					     NUMA_NO_NODE, vm);

	if (vpe_base_irq <= 0)

		goto err;