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

Pull irq updates from Thomas Gleixner:
 "This updated pull request does not contain the last few GIC related
  patches which were reported to cause a regression.  There is a fix
  available, but I let it breed for a couple of days first.

  The irq departement provides:

   - new infrastructure to support non PCI based MSI interrupts
   - a couple of new irq chip drivers
   - the usual pile of fixlets and updates to irq chip drivers
   - preparatory changes for removal of the irq argument from interrupt
     flow handlers
   - preparatory changes to remove IRQF_VALID"

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (129 commits)
  irqchip/imx-gpcv2: IMX GPCv2 driver for wakeup sources
  irqchip: Add bcm2836 interrupt controller for Raspberry Pi 2
  irqchip: Add documentation for the bcm2836 interrupt controller
  irqchip/bcm2835: Add support for being used as a second level controller
  irqchip/bcm2835: Refactor handle_IRQ() calls out of MAKE_HWIRQ
  PCI: xilinx: Fix typo in function name
  irqchip/gic: Ensure gic_cpu_if_up/down() programs correct GIC instance
  irqchip/gic: Only allow the primary GIC to set the CPU map
  PCI/MSI: pci-xgene-msi: Consolidate chained IRQ handler install/remove
  unicore32/irq: Prepare puv3_gpio_handler for irq argument removal
  tile/pci_gx: Prepare trio_handle_level_irq for irq argument removal
  m68k/irq: Prepare irq handlers for irq argument removal
  C6X/megamode-pic: Prepare megamod_irq_cascade for irq argument removal
  blackfin: Prepare irq handlers for irq argument removal
  arc/irq: Prepare idu_cascade_isr for irq argument removal
  sparc/irq: Use access helper irq_data_get_affinity_mask()
  sparc/irq: Use helper irq_data_get_irq_handler_data()
  parisc/irq: Use access helper irq_data_get_affinity_mask()
  mn10300/irq: Use access helper irq_data_get_affinity_mask()
  irqchip/i8259: Prepare i8259_irq_dispatch for irq argument removal
  ...

1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c
index a4d8c043a710..bdfb3c84c3cb 100644
--- a/drivers/spmi/spmi-pmic-arb.c
+++ b/drivers/spmi/spmi-pmic-arb.c
@@ -453,8 +453,8 @@ static void periph_interrupt(struct spmi_pmic_arb_dev *pa, u8 apid)
 
 static void pmic_arb_chained_irq(unsigned int irq, struct irq_desc *desc)
 {
-        struct spmi_pmic_arb_dev *pa = irq_get_handler_data(irq);
-        struct irq_chip *chip = irq_get_chip(irq);
+        struct spmi_pmic_arb_dev *pa = irq_desc_get_handler_data(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         void __iomem *intr = pa->intr;
         int first = pa->min_apid >> 5;
         int last = pa->max_apid >> 5;
@@ -945,8 +945,7 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
                 goto err_put_ctrl;
         }
 
-        irq_set_handler_data(pa->irq, pa);
-        irq_set_chained_handler(pa->irq, pmic_arb_chained_irq);
+        irq_set_chained_handler_and_data(pa->irq, pmic_arb_chained_irq, pa);
 
         err = spmi_controller_add(ctrl);
         if (err)
@@ -955,8 +954,7 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev)
         return 0;
 
 err_domain_remove:
-        irq_set_chained_handler(pa->irq, NULL);
-        irq_set_handler_data(pa->irq, NULL);
+        irq_set_chained_handler_and_data(pa->irq, NULL, NULL);
         irq_domain_remove(pa->domain);
 err_put_ctrl:
         spmi_controller_put(ctrl);
@@ -968,8 +966,7 @@ static int spmi_pmic_arb_remove(struct platform_device *pdev)
         struct spmi_controller *ctrl = platform_get_drvdata(pdev);
         struct spmi_pmic_arb_dev *pa = spmi_controller_get_drvdata(ctrl);
         spmi_controller_remove(ctrl);
-        irq_set_chained_handler(pa->irq, NULL);
-        irq_set_handler_data(pa->irq, NULL);
+        irq_set_chained_handler_and_data(pa->irq, NULL, NULL);
         irq_domain_remove(pa->domain);
         spmi_controller_put(ctrl);
         return 0;