forked from mirrors/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>
This commit is contained in:
		
							parent
							
								
									61d0a000b7
								
							
						
					
					
						commit
						96f0d93a48
					
				
					 8 changed files with 8 additions and 8 deletions
				
			
		|  | @ -195,7 +195,7 @@ struct irq_domain *platform_msi_create_irq_domain(struct fwnode_handle *fwnode, | ||||||
| 
 | 
 | ||||||
| 	domain = msi_create_irq_domain(fwnode, info, parent); | 	domain = msi_create_irq_domain(fwnode, info, parent); | ||||||
| 	if (domain) | 	if (domain) | ||||||
| 		domain->bus_token = DOMAIN_BUS_PLATFORM_MSI; | 		irq_domain_update_bus_token(domain, DOMAIN_BUS_PLATFORM_MSI); | ||||||
| 
 | 
 | ||||||
| 	return domain; | 	return domain; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -563,7 +563,7 @@ static int __init armada_370_xp_mpic_of_init(struct device_node *node, | ||||||
| 		irq_domain_add_linear(node, nr_irqs, | 		irq_domain_add_linear(node, nr_irqs, | ||||||
| 				&armada_370_xp_mpic_irq_ops, NULL); | 				&armada_370_xp_mpic_irq_ops, NULL); | ||||||
| 	BUG_ON(!armada_370_xp_mpic_domain); | 	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 */ | 	/* Setup for the boot CPU */ | ||||||
| 	armada_xp_mpic_perf_init(); | 	armada_xp_mpic_perf_init(); | ||||||
|  |  | ||||||
|  | @ -280,7 +280,7 @@ static int gicv2m_allocate_domains(struct irq_domain *parent) | ||||||
| 		return -ENOMEM; | 		return -ENOMEM; | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	inner_domain->bus_token = DOMAIN_BUS_NEXUS; | 	irq_domain_update_bus_token(inner_domain, DOMAIN_BUS_NEXUS); | ||||||
| 	inner_domain->parent = parent; | 	inner_domain->parent = parent; | ||||||
| 	pci_domain = pci_msi_create_irq_domain(v2m->fwnode, | 	pci_domain = pci_msi_create_irq_domain(v2m->fwnode, | ||||||
| 					       &gicv2m_msi_domain_info, | 					       &gicv2m_msi_domain_info, | ||||||
|  |  | ||||||
|  | @ -1661,7 +1661,7 @@ static int its_init_domain(struct fwnode_handle *handle, struct its_node *its) | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	inner_domain->parent = its_parent; | 	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; | 	inner_domain->flags |= IRQ_DOMAIN_FLAG_MSI_REMAP; | ||||||
| 	info->ops = &its_msi_domain_ops; | 	info->ops = &its_msi_domain_ops; | ||||||
| 	info->data = its; | 	info->data = its; | ||||||
|  |  | ||||||
|  | @ -240,7 +240,7 @@ static void mips_cpu_register_ipi_domain(struct device_node *of_node) | ||||||
| 					      ipi_domain_state); | 					      ipi_domain_state); | ||||||
| 	if (!ipi_domain) | 	if (!ipi_domain) | ||||||
| 		panic("Failed to add MIPS CPU 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 */ | #else /* !CONFIG_GENERIC_IRQ_IPI */ | ||||||
|  |  | ||||||
|  | @ -960,7 +960,7 @@ static void __init __gic_init(unsigned long gic_base_addr, | ||||||
| 		panic("Failed to add GIC IPI domain"); | 		panic("Failed to add GIC IPI domain"); | ||||||
| 
 | 
 | ||||||
| 	gic_ipi_domain->name = "mips-gic-ipi"; | 	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 && | 	if (node && | ||||||
| 	    !of_property_read_u32_array(node, "mti,reserved-ipi-vectors", v, 2)) { | 	    !of_property_read_u32_array(node, "mti,reserved-ipi-vectors", v, 2)) { | ||||||
|  |  | ||||||
|  | @ -1463,7 +1463,7 @@ struct irq_domain *pci_msi_create_irq_domain(struct fwnode_handle *fwnode, | ||||||
| 	if (!domain) | 	if (!domain) | ||||||
| 		return NULL; | 		return NULL; | ||||||
| 
 | 
 | ||||||
| 	domain->bus_token = DOMAIN_BUS_PCI_MSI; | 	irq_domain_update_bus_token(domain, DOMAIN_BUS_PCI_MSI); | ||||||
| 	return domain; | 	return domain; | ||||||
| } | } | ||||||
| EXPORT_SYMBOL_GPL(pci_msi_create_irq_domain); | EXPORT_SYMBOL_GPL(pci_msi_create_irq_domain); | ||||||
|  |  | ||||||
|  | @ -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); | 	domain = msi_create_irq_domain(fwnode, info, parent); | ||||||
| 	if (domain) | 	if (domain) | ||||||
| 		domain->bus_token = DOMAIN_BUS_FSL_MC_MSI; | 		irq_domain_update_bus_token(domain, DOMAIN_BUS_FSL_MC_MSI); | ||||||
| 
 | 
 | ||||||
| 	return domain; | 	return domain; | ||||||
| } | } | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 Marc Zyngier
						Marc Zyngier