PCI: aardvark: Make MSI irq_chip structures static driver structures

commit c3cb8e51839adc0aaef478c47665443d02f5aa07 upstream.

In [1] it was agreed that we should use struct irq_chip as a global
static struct in the driver. Even though the structure currently
contains a dynamic member (parent_device), In [2] the plans to kill it
and make the structure completely static were set out.

Convert Aardvark's priv->msi_bottom_irq_chip and priv->msi_irq_chip to
static driver structure.

[1] https://lore.kernel.org/linux-pci/877dbcvngf.wl-maz@kernel.org/
[2] https://lore.kernel.org/linux-pci/874k6gvkhz.wl-maz@kernel.org/

Link: https://lore.kernel.org/r/20220110015018.26359-7-kabel@kernel.org
Signed-off-by: Marek Behún <kabel@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Marek Behún <kabel@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index 00fe1e6..7011a4a 100644 (file)
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -274,8 +274,6 @@ struct advk_pcie {
        raw_spinlock_t irq_lock;
        struct irq_domain *msi_domain;
        struct irq_domain *msi_inner_domain;
-       struct irq_chip msi_bottom_irq_chip;
-       struct irq_chip msi_irq_chip;
        struct msi_domain_info msi_domain_info;
        DECLARE_BITMAP(msi_used, MSI_IRQ_NUM);
        struct mutex msi_used_lock;
@@ -1194,6 +1192,12 @@ static int advk_msi_set_affinity(struct irq_data *irq_data,
        return -EINVAL;
 }
 
+static struct irq_chip advk_msi_bottom_irq_chip = {
+       .name                   = "MSI",
+       .irq_compose_msi_msg    = advk_msi_irq_compose_msi_msg,
+       .irq_set_affinity       = advk_msi_set_affinity,
+};
+
 static int advk_msi_irq_domain_alloc(struct irq_domain *domain,
                                     unsigned int virq,
                                     unsigned int nr_irqs, void *args)
@@ -1210,7 +1214,7 @@ static int advk_msi_irq_domain_alloc(struct irq_domain *domain,
 
        for (i = 0; i < nr_irqs; i++)
                irq_domain_set_info(domain, virq + i, hwirq + i,
-                                   &pcie->msi_bottom_irq_chip,
+                                   &advk_msi_bottom_irq_chip,
                                    domain->host_data, handle_simple_irq,
                                    NULL, NULL);
 
@@ -1280,29 +1284,23 @@ static const struct irq_domain_ops advk_pcie_irq_domain_ops = {
        .xlate = irq_domain_xlate_onecell,
 };
 
+static struct irq_chip advk_msi_irq_chip = {
+       .name = "advk-MSI",
+};
+
 static int advk_pcie_init_msi_irq_domain(struct advk_pcie *pcie)
 {
        struct device *dev = &pcie->pdev->dev;
        struct device_node *node = dev->of_node;
-       struct irq_chip *bottom_ic, *msi_ic;
        struct msi_domain_info *msi_di;
        phys_addr_t msi_msg_phys;
 
        mutex_init(&pcie->msi_used_lock);
 
-       bottom_ic = &pcie->msi_bottom_irq_chip;
-
-       bottom_ic->name = "MSI";
-       bottom_ic->irq_compose_msi_msg = advk_msi_irq_compose_msi_msg;
-       bottom_ic->irq_set_affinity = advk_msi_set_affinity;
-
-       msi_ic = &pcie->msi_irq_chip;
-       msi_ic->name = "advk-MSI";
-
        msi_di = &pcie->msi_domain_info;
        msi_di->flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
                MSI_FLAG_MULTI_PCI_MSI;
-       msi_di->chip = msi_ic;
+       msi_di->chip = &advk_msi_irq_chip;
 
        msi_msg_phys = virt_to_phys(&pcie->msi_msg);