Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

irqchip/MSI: Use irq_domain_update_bus_token instead of an open coded access

Now that we have irq_domain_update_bus_token(), switch everyone over
to it. The debugfs code thanks you for your continued support.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

authored by

Marc Zyngier and committed by
Thomas Gleixner
96f0d93a 61d0a000

+8 -8
+1 -1
drivers/base/platform-msi.c
··· 195 195 196 196 domain = msi_create_irq_domain(fwnode, info, parent); 197 197 if (domain) 198 - domain->bus_token = DOMAIN_BUS_PLATFORM_MSI; 198 + irq_domain_update_bus_token(domain, DOMAIN_BUS_PLATFORM_MSI); 199 199 200 200 return domain; 201 201 }
+1 -1
drivers/irqchip/irq-armada-370-xp.c
··· 563 563 irq_domain_add_linear(node, nr_irqs, 564 564 &armada_370_xp_mpic_irq_ops, NULL); 565 565 BUG_ON(!armada_370_xp_mpic_domain); 566 - armada_370_xp_mpic_domain->bus_token = DOMAIN_BUS_WIRED; 566 + irq_domain_update_bus_token(armada_370_xp_mpic_domain, DOMAIN_BUS_WIRED); 567 567 568 568 /* Setup for the boot CPU */ 569 569 armada_xp_mpic_perf_init();
+1 -1
drivers/irqchip/irq-gic-v2m.c
··· 280 280 return -ENOMEM; 281 281 } 282 282 283 - inner_domain->bus_token = DOMAIN_BUS_NEXUS; 283 + irq_domain_update_bus_token(inner_domain, DOMAIN_BUS_NEXUS); 284 284 inner_domain->parent = parent; 285 285 pci_domain = pci_msi_create_irq_domain(v2m->fwnode, 286 286 &gicv2m_msi_domain_info,
+1 -1
drivers/irqchip/irq-gic-v3-its.c
··· 1661 1661 } 1662 1662 1663 1663 inner_domain->parent = its_parent; 1664 - inner_domain->bus_token = DOMAIN_BUS_NEXUS; 1664 + irq_domain_update_bus_token(inner_domain, DOMAIN_BUS_NEXUS); 1665 1665 inner_domain->flags |= IRQ_DOMAIN_FLAG_MSI_REMAP; 1666 1666 info->ops = &its_msi_domain_ops; 1667 1667 info->data = its;
+1 -1
drivers/irqchip/irq-mips-cpu.c
··· 240 240 ipi_domain_state); 241 241 if (!ipi_domain) 242 242 panic("Failed to add MIPS CPU IPI domain"); 243 - ipi_domain->bus_token = DOMAIN_BUS_IPI; 243 + irq_domain_update_bus_token(ipi_domain, DOMAIN_BUS_IPI); 244 244 } 245 245 246 246 #else /* !CONFIG_GENERIC_IRQ_IPI */
+1 -1
drivers/irqchip/irq-mips-gic.c
··· 960 960 panic("Failed to add GIC IPI domain"); 961 961 962 962 gic_ipi_domain->name = "mips-gic-ipi"; 963 - gic_ipi_domain->bus_token = DOMAIN_BUS_IPI; 963 + irq_domain_update_bus_token(gic_ipi_domain, DOMAIN_BUS_IPI); 964 964 965 965 if (node && 966 966 !of_property_read_u32_array(node, "mti,reserved-ipi-vectors", v, 2)) {
+1 -1
drivers/pci/msi.c
··· 1463 1463 if (!domain) 1464 1464 return NULL; 1465 1465 1466 - domain->bus_token = DOMAIN_BUS_PCI_MSI; 1466 + irq_domain_update_bus_token(domain, DOMAIN_BUS_PCI_MSI); 1467 1467 return domain; 1468 1468 } 1469 1469 EXPORT_SYMBOL_GPL(pci_msi_create_irq_domain);
+1 -1
drivers/staging/fsl-mc/bus/fsl-mc-msi.c
··· 170 170 171 171 domain = msi_create_irq_domain(fwnode, info, parent); 172 172 if (domain) 173 - domain->bus_token = DOMAIN_BUS_FSL_MC_MSI; 173 + irq_domain_update_bus_token(domain, DOMAIN_BUS_FSL_MC_MSI); 174 174 175 175 return domain; 176 176 }