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

Marc Zyngier · KAGA-KOKO · commit 96f0d93a487e · 2017-06-22T18:29:17.000+02:00
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 &lt;marc.zyngier@arm.com&gt;
Signed-off-by: Thomas Gleixner &lt;tglx@linutronix.de&gt;
diff --git a/drivers/base/platform-msi.c b/drivers/base/platform-msi.c
@@ -195,7 +195,7 @@ struct irq_domain *platform_msi_create_irq_domain(struct fwnode_handle *fwnode,
 
 	domain = msi_create_irq_domain(fwnode, info, parent);
 	if (domain)
-		domain->bus_token = DOMAIN_BUS_PLATFORM_MSI;
+		irq_domain_update_bus_token(domain, DOMAIN_BUS_PLATFORM_MSI);
 
 	return domain;
 }
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
@@ -563,7 +563,7 @@ static int __init armada_370_xp_mpic_of_init(struct device_node *node,
 		irq_domain_add_linear(node, nr_irqs,
 				&armada_370_xp_mpic_irq_ops, NULL);
 	BUG_ON(!armada_370_xp_mpic_domain);
-	armada_370_xp_mpic_domain->bus_token = DOMAIN_BUS_WIRED;
+	irq_domain_update_bus_token(armada_370_xp_mpic_domain, DOMAIN_BUS_WIRED);
 
 	/* Setup for the boot CPU */
 	armada_xp_mpic_perf_init();
diff --git a/drivers/irqchip/irq-gic-v2m.c b/drivers/irqchip/irq-gic-v2m.c
@@ -280,7 +280,7 @@ static int gicv2m_allocate_domains(struct irq_domain *parent)
 		return -ENOMEM;
 	}
 
-	inner_domain->bus_token = DOMAIN_BUS_NEXUS;
+	irq_domain_update_bus_token(inner_domain, DOMAIN_BUS_NEXUS);
 	inner_domain->parent = parent;
 	pci_domain = pci_msi_create_irq_domain(v2m->fwnode,
 					       &gicv2m_msi_domain_info,
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
@@ -1661,7 +1661,7 @@ static int its_init_domain(struct fwnode_handle *handle, struct its_node *its)
 	}
 
 	inner_domain->parent = its_parent;
-	inner_domain->bus_token = DOMAIN_BUS_NEXUS;
+	irq_domain_update_bus_token(inner_domain, DOMAIN_BUS_NEXUS);
 	inner_domain->flags |= IRQ_DOMAIN_FLAG_MSI_REMAP;
 	info->ops = &its_msi_domain_ops;
 	info->data = its;
diff --git a/drivers/irqchip/irq-mips-cpu.c b/drivers/irqchip/irq-mips-cpu.c
@@ -240,7 +240,7 @@ static void mips_cpu_register_ipi_domain(struct device_node *of_node)
 					      ipi_domain_state);
 	if (!ipi_domain)
 		panic("Failed to add MIPS CPU IPI domain");
-	ipi_domain->bus_token = DOMAIN_BUS_IPI;
+	irq_domain_update_bus_token(ipi_domain, DOMAIN_BUS_IPI);
 }
 
 #else /* !CONFIG_GENERIC_IRQ_IPI */
diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c
@@ -960,7 +960,7 @@ static void __init __gic_init(unsigned long gic_base_addr,
 		panic("Failed to add GIC IPI domain");
 
 	gic_ipi_domain->name = "mips-gic-ipi";
-	gic_ipi_domain->bus_token = DOMAIN_BUS_IPI;
+	irq_domain_update_bus_token(gic_ipi_domain, DOMAIN_BUS_IPI);
 
 	if (node &&
 	    !of_property_read_u32_array(node, "mti,reserved-ipi-vectors", v, 2)) {
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
@@ -1463,7 +1463,7 @@ struct irq_domain *pci_msi_create_irq_domain(struct fwnode_handle *fwnode,
 	if (!domain)
 		return NULL;
 
-	domain->bus_token = DOMAIN_BUS_PCI_MSI;
+	irq_domain_update_bus_token(domain, DOMAIN_BUS_PCI_MSI);
 	return domain;
 }
 EXPORT_SYMBOL_GPL(pci_msi_create_irq_domain);
diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c b/drivers/staging/fsl-mc/bus/fsl-mc-msi.c
@@ -170,7 +170,7 @@ struct irq_domain *fsl_mc_msi_create_irq_domain(struct fwnode_handle *fwnode,
 
 	domain = msi_create_irq_domain(fwnode, info, parent);
 	if (domain)
-		domain->bus_token = DOMAIN_BUS_FSL_MC_MSI;
+		irq_domain_update_bus_token(domain, DOMAIN_BUS_FSL_MC_MSI);
 
 	return domain;
 }

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ struct irq_domain platform_msi_create_irq_domain(struct fwnode_handle fwnode,`
`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`	`}`
Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ static int gicv2m_allocate_domains(struct irq_domain *parent)`
`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,`
Original file line number	Diff line number	Diff line change
`@@ -1661,7 +1661,7 @@ static int its_init_domain(struct fwnode_handle handle, struct its_node its)`
`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;`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ static void mips_cpu_register_ipi_domain(struct device_node *of_node)`
`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 */`
Original file line number	Diff line number	Diff line change
`@@ -1463,7 +1463,7 @@ struct irq_domain pci_msi_create_irq_domain(struct fwnode_handle fwnode,`
`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);`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ struct irq_domain fsl_mc_msi_create_irq_domain(struct fwnode_handle fwnode,`
`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`	`}`