generic: 5.15: refresh pending patch

[openwrt/staging/mkresin.git] / target / linux / generic / pending-5.15 / 850-0007-PCI-aardvark-Make-msi_domain_info-structure-a-static.patch

diff --git a/target/linux/generic/pending-5.15/850-0007-PCI-aardvark-Make-msi_domain_info-structure-a-static.patch b/target/linux/generic/pending-5.15/850-0007-PCI-aardvark-Make-msi_domain_info-structure-a-static.patch
index 2f15b5b8d6bacd57061fed96245d8718873b4082..370de6cdc71540a598bd69599a339ce79560e0f5 100644 (file)
--- a/target/linux/generic/pending-5.15/850-0007-PCI-aardvark-Make-msi_domain_info-structure-a-static.patch
+++ b/target/linux/generic/pending-5.15/850-0007-PCI-aardvark-Make-msi_domain_info-structure-a-static.patch
@@ -17,7 +17,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -281,7 +281,6 @@ struct advk_pcie {
+@@ -274,7 +274,6 @@ struct advk_pcie {
        raw_spinlock_t irq_lock;
        struct irq_domain *msi_domain;
        struct irq_domain *msi_inner_domain;
@@ -25,7 +25,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
        DECLARE_BITMAP(msi_used, MSI_IRQ_NUM);
        struct mutex msi_used_lock;
        u16 msi_msg;
-@@ -1293,20 +1292,20 @@ static struct irq_chip advk_msi_irq_chip
+@@ -1286,20 +1285,20 @@ static struct irq_chip advk_msi_irq_chip
        .name = "advk-MSI",
  };
  
@@ -52,7 +52,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
        msi_msg_phys = virt_to_phys(&pcie->msi_msg);
  
        advk_writel(pcie, lower_32_bits(msi_msg_phys),
-@@ -1322,7 +1321,8 @@ static int advk_pcie_init_msi_irq_domain
+@@ -1315,7 +1314,8 @@ static int advk_pcie_init_msi_irq_domain
  
        pcie->msi_domain =
                pci_msi_create_irq_domain(of_node_to_fwnode(node),