aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-05-07 11:44:16 -0400
committerThomas Gleixner <tglx@linutronix.de>2014-05-16 08:05:21 -0400
commit2aa799d891299457e4107d33f07a1ed5ac8849ae (patch)
tree3afecf068bcb8da8aca60468ffed88a5914e2aa5
parent3dfd442e5ffc6c488e34b6f1028bbb0ce310e6c4 (diff)
tile: pci: Use irq_alloc/free_hwirq()
No functional change. Just convert to the new interface. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Grant Likely <grant.likely@linaro.org> Cc: Tony Luck <tony.luck@intel.com> Cc: Peter Zijlstra <peterz@infradead.org> Acked-by: Chris Metcalf <cmetcalf@tilera.com> Link: http://lkml.kernel.org/r/20140507154338.132662495@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/tile/kernel/pci_gx.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c
index 077b7bc437e5..e39f9c542807 100644
--- a/arch/tile/kernel/pci_gx.c
+++ b/arch/tile/kernel/pci_gx.c
@@ -350,10 +350,9 @@ static int tile_init_irqs(struct pci_controller *controller)
350 int cpu; 350 int cpu;
351 351
352 /* Ask the kernel to allocate an IRQ. */ 352 /* Ask the kernel to allocate an IRQ. */
353 irq = create_irq(); 353 irq = irq_alloc_hwirq(-1);
354 if (irq < 0) { 354 if (!irq) {
355 pr_err("PCI: no free irq vectors, failed for %d\n", i); 355 pr_err("PCI: no free irq vectors, failed for %d\n", i);
356
357 goto free_irqs; 356 goto free_irqs;
358 } 357 }
359 controller->irq_intx_table[i] = irq; 358 controller->irq_intx_table[i] = irq;
@@ -382,7 +381,7 @@ static int tile_init_irqs(struct pci_controller *controller)
382 381
383free_irqs: 382free_irqs:
384 for (j = 0; j < i; j++) 383 for (j = 0; j < i; j++)
385 destroy_irq(controller->irq_intx_table[j]); 384 irq_free_hwirq(controller->irq_intx_table[j]);
386 385
387 return -1; 386 return -1;
388} 387}
@@ -1500,9 +1499,9 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
1500 int irq; 1499 int irq;
1501 int ret; 1500 int ret;
1502 1501
1503 irq = create_irq(); 1502 irq = irq_alloc_hwirq(-1);
1504 if (irq < 0) 1503 if (!irq)
1505 return irq; 1504 return -ENOSPC;
1506 1505
1507 /* 1506 /*
1508 * Since we use a 64-bit Mem-Map to accept the MSI write, we fail 1507 * Since we use a 64-bit Mem-Map to accept the MSI write, we fail
@@ -1601,11 +1600,11 @@ hv_msi_config_failure:
1601 /* Free mem-map */ 1600 /* Free mem-map */
1602msi_mem_map_alloc_failure: 1601msi_mem_map_alloc_failure:
1603is_64_failure: 1602is_64_failure:
1604 destroy_irq(irq); 1603 irq_free_hwirq(irq);
1605 return ret; 1604 return ret;
1606} 1605}
1607 1606
1608void arch_teardown_msi_irq(unsigned int irq) 1607void arch_teardown_msi_irq(unsigned int irq)
1609{ 1608{
1610 destroy_irq(irq); 1609 irq_free_hwirq(irq);
1611} 1610}