Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull IRQ chip updates from Ingo Molnar:
 "A late irqchips update:

   - New TI INTR/INTA set of drivers

   - Rewrite of the stm32mp1-exti driver as a platform driver

   - Update the IOMMU MSI mapping API to be RT friendly

   - A number of cleanups and other low impact fixes"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (34 commits)
  iommu/dma-iommu: Remove iommu_dma_map_msi_msg()
  irqchip/gic-v3-mbi: Don't map the MSI page in mbi_compose_m{b, s}i_msg()
  irqchip/ls-scfg-msi: Don't map the MSI page in ls_scfg_msi_compose_msg()
  irqchip/gic-v3-its: Don't map the MSI page in its_irq_compose_msi_msg()
  irqchip/gicv2m: Don't map the MSI page in gicv2m_compose_msi_msg()
  iommu/dma-iommu: Split iommu_dma_map_msi_msg() in two parts
  genirq/msi: Add a new field in msi_desc to store an IOMMU cookie
  arm64: arch_k3: Enable interrupt controller drivers
  irqchip/ti-sci-inta: Add msi domain support
  soc: ti: Add MSI domain bus support for Interrupt Aggregator
  irqchip/ti-sci-inta: Add support for Interrupt Aggregator driver
  dt-bindings: irqchip: Introduce TISCI Interrupt Aggregator bindings
  irqchip/ti-sci-intr: Add support for Interrupt Router driver
  dt-bindings: irqchip: Introduce TISCI Interrupt router bindings
  gpio: thunderx: Use the default parent apis for {request,release}_resources
  genirq: Introduce irq_chip_{request,release}_resource_parent() apis
  firmware: ti_sci: Add helper apis to manage resources
  firmware: ti_sci: Add RM mapping table for am654
  firmware: ti_sci: Add support for IRQ management
  firmware: ti_sci: Add support for RM core ops
  ...

1 files changed, 4 insertions, 12 deletions

diff --git a/drivers/gpio/gpio-thunderx.c b/drivers/gpio/gpio-thunderx.c
index 1306722faa5a..715371b5102a 100644
--- a/drivers/gpio/gpio-thunderx.c
+++ b/drivers/gpio/gpio-thunderx.c
@@ -363,22 +363,16 @@ static int thunderx_gpio_irq_request_resources(struct irq_data *data)
 {
         struct thunderx_line *txline = irq_data_get_irq_chip_data(data);
         struct thunderx_gpio *txgpio = txline->txgpio;
-        struct irq_data *parent_data = data->parent_data;
         int r;
 
         r = gpiochip_lock_as_irq(&txgpio->chip, txline->line);
         if (r)
                 return r;
 
-        if (parent_data && parent_data->chip->irq_request_resources) {
-                r = parent_data->chip->irq_request_resources(parent_data);
-                if (r)
-                        goto error;
-        }
+        r = irq_chip_request_resources_parent(data);
+        if (r)
+                gpiochip_unlock_as_irq(&txgpio->chip, txline->line);
 
-        return 0;
-error:
-        gpiochip_unlock_as_irq(&txgpio->chip, txline->line);
         return r;
 }
 
@@ -386,10 +380,8 @@ static void thunderx_gpio_irq_release_resources(struct irq_data *data)
 {
         struct thunderx_line *txline = irq_data_get_irq_chip_data(data);
         struct thunderx_gpio *txgpio = txline->txgpio;
-        struct irq_data *parent_data = data->parent_data;
 
-        if (parent_data && parent_data->chip->irq_release_resources)
-                parent_data->chip->irq_release_resources(parent_data);
+        irq_chip_release_resources_parent(data);
 
         gpiochip_unlock_as_irq(&txgpio->chip, txline->line);
 }