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

Pull core irq updates from Thomas Gleixner:
 "The irq department delivers:

   - Another tree wide update to get rid of the horrible create_irq
     interface along with its even more horrible variants.  That also
     gets rid of the last leftovers of the initial sparse irq hackery.
     arch/driver specific changes have been either acked or ignored.

   - A fix for the spurious interrupt detection logic with threaded
     interrupts.

   - A new ARM SoC interrupt controller

   - The usual pile of fixes and improvements all over the place"

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (40 commits)
  Documentation: brcmstb-l2: Add Broadcom STB Level-2 interrupt controller binding
  irqchip: brcmstb-l2: Add Broadcom Set Top Box Level-2 interrupt controller
  genirq: Improve documentation to match current implementation
  ARM: iop13xx: fix msi support with sparse IRQ
  genirq: Provide !SMP stub for irq_set_affinity_notifier()
  irqchip: armada-370-xp: Move the devicetree binding documentation
  irqchip: gic: Use mask field in GICC_IAR
  genirq: Remove dynamic_irq mess
  ia64: Use irq_init_desc
  genirq: Replace dynamic_irq_init/cleanup
  genirq: Remove irq_reserve_irq[s]
  genirq: Replace reserve_irqs in core code
  s390: Avoid call to irq_reserve_irqs()
  s390: Remove pointless arch_show_interrupts()
  s390: pci: Check return value of alloc_irq_desc() proper
  sh: intc: Remove pointless irq_reserve_irqs() invocation
  x86, irq: Remove pointless irq_reserve_irqs() call
  genirq: Make create/destroy_irq() ia64 private
  tile: Use SPARSE_IRQ
  tile: pci: Use irq_alloc/free_hwirq()
  ...

2 files changed, 8 insertions, 8 deletions

diff --git a/drivers/tty/hvc/hvc_tile.c b/drivers/tty/hvc/hvc_tile.c
index af8cdaa1dcb9..147d49e95db2 100644
--- a/drivers/tty/hvc/hvc_tile.c
+++ b/drivers/tty/hvc/hvc_tile.c
@@ -133,14 +133,14 @@ static int hvc_tile_probe(struct platform_device *pdev)
         int tile_hvc_irq;
 
         /* Create our IRQ and register it. */
-        tile_hvc_irq = create_irq();
-        if (tile_hvc_irq < 0)
+        tile_hvc_irq = irq_alloc_hwirq(-1);
+        if (!tile_hvc_irq)
                 return -ENXIO;
 
         tile_irq_activate(tile_hvc_irq, TILE_IRQ_PERCPU);
         hp = hvc_alloc(0, tile_hvc_irq, &hvc_tile_get_put_ops, 128);
         if (IS_ERR(hp)) {
-                destroy_irq(tile_hvc_irq);
+                irq_free_hwirq(tile_hvc_irq);
                 return PTR_ERR(hp);
         }
         dev_set_drvdata(&pdev->dev, hp);
@@ -155,7 +155,7 @@ static int hvc_tile_remove(struct platform_device *pdev)
 
         rc = hvc_remove(hp);
         if (rc == 0)
-                destroy_irq(hp->data);
+                irq_free_hwirq(hp->data);
 
         return rc;
 }
diff --git a/drivers/tty/serial/tilegx.c b/drivers/tty/serial/tilegx.c
index f92d7e6bd876..613ccf09dc2a 100644
--- a/drivers/tty/serial/tilegx.c
+++ b/drivers/tty/serial/tilegx.c
@@ -359,8 +359,8 @@ static int tilegx_startup(struct uart_port *port)
                 }
 
                 /* Create our IRQs. */
-                port->irq = create_irq();
-                if (port->irq < 0)
+                port->irq = irq_alloc_hwirq(-1);
+                if (!port->irq)
                         goto err_uart_dest;
                 tile_irq_activate(port->irq, TILE_IRQ_PERCPU);
 
@@ -395,7 +395,7 @@ static int tilegx_startup(struct uart_port *port)
 err_free_irq:
         free_irq(port->irq, port);
 err_dest_irq:
-        destroy_irq(port->irq);
+        irq_free_hwirq(port->irq);
 err_uart_dest:
         gxio_uart_destroy(context);
         ret = -ENXIO;
@@ -435,7 +435,7 @@ static void tilegx_shutdown(struct uart_port *port)
 
         if (port->irq > 0) {
                 free_irq(port->irq, port);
-                destroy_irq(port->irq);
+                irq_free_hwirq(port->irq);
                 port->irq = 0;
         }