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>

diff --git a/drivers/base/platform-msi.c b/drivers/base/platform-msi.c
index d35e9a2..e547352 100644 (file)
--- 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
index eb0d4d4..5e16d04 100644 (file)
--- 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
index 863e073..993a842 100644 (file)
--- 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
index 45ea193..0590165 100644 (file)
--- 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
index b247f3c..0a8ed1c 100644 (file)
--- 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
index eb7fbe1..d3a6dc8 100644 (file)
--- 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
index ba44fdf..fbad5dc 100644 (file)
--- 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
index b8b2c86..17d5cf9 100644 (file)
--- 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;
 }