kernel: bump 5.10 to 5.10.92

[openwrt/staging/jow.git] / target / linux / generic / pending-5.10 / 850-0023-PCI-aardvark-Make-main-irq_chip-structure-a-static-d.patch

diff --git a/target/linux/generic/pending-5.10/850-0023-PCI-aardvark-Make-main-irq_chip-structure-a-static-d.patch b/target/linux/generic/pending-5.10/850-0023-PCI-aardvark-Make-main-irq_chip-structure-a-static-d.patch
index 2951529df73452554d08e984436f828d0f36244e..d5fbcdc787428f3f9d0db6c9c20901947a20f08c 100644 (file)
--- a/target/linux/generic/pending-5.10/850-0023-PCI-aardvark-Make-main-irq_chip-structure-a-static-d.patch
+++ b/target/linux/generic/pending-5.10/850-0023-PCI-aardvark-Make-main-irq_chip-structure-a-static-d.patch
@@ -31,8 +31,6 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
  drivers/pci/controller/pci-aardvark.c | 25 +++++++------------------
  1 file changed, 7 insertions(+), 18 deletions(-)
 
-diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
-index 3c0b6b931061..319dd830e36e 100644
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
 @@ -282,7 +282,6 @@ struct advk_pcie {
@@ -43,7 +41,7 @@ index 3c0b6b931061..319dd830e36e 100644
        raw_spinlock_t irq_lock;
        struct irq_domain *msi_domain;
        struct irq_domain *msi_inner_domain;
-@@ -1336,14 +1335,19 @@ static void advk_pcie_irq_unmask(struct irq_data *d)
+@@ -1336,14 +1335,19 @@ static void advk_pcie_irq_unmask(struct
        raw_spin_unlock_irqrestore(&pcie->irq_lock, flags);
  }
  
@@ -65,7 +63,7 @@ index 3c0b6b931061..319dd830e36e 100644
        irq_set_chip_data(virq, pcie);
  
        return 0;
-@@ -1402,7 +1406,6 @@ static int advk_pcie_init_irq_domain(struct advk_pcie *pcie)
+@@ -1402,7 +1406,6 @@ static int advk_pcie_init_irq_domain(str
        struct device *dev = &pcie->pdev->dev;
        struct device_node *node = dev->of_node;
        struct device_node *pcie_intc_node;
@@ -73,7 +71,7 @@ index 3c0b6b931061..319dd830e36e 100644
        int ret = 0;
  
        raw_spin_lock_init(&pcie->irq_lock);
-@@ -1413,28 +1416,14 @@ static int advk_pcie_init_irq_domain(struct advk_pcie *pcie)
+@@ -1413,28 +1416,14 @@ static int advk_pcie_init_irq_domain(str
                return -ENODEV;
        }
  
@@ -102,6 +100,3 @@ index 3c0b6b931061..319dd830e36e 100644
        of_node_put(pcie_intc_node);
        return ret;
  }
--- 
-2.34.1
-