Commit 2aa799d8 authored by Thomas Gleixner's avatar Thomas Gleixner

tile: pci: Use irq_alloc/free_hwirq()

No functional change. Just convert to the new interface.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarGrant Likely <grant.likely@linaro.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Acked-by: default avatarChris Metcalf <cmetcalf@tilera.com>
Link: http://lkml.kernel.org/r/20140507154338.132662495@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 3dfd442e
...@@ -350,10 +350,9 @@ static int tile_init_irqs(struct pci_controller *controller) ...@@ -350,10 +350,9 @@ static int tile_init_irqs(struct pci_controller *controller)
int cpu; int cpu;
/* Ask the kernel to allocate an IRQ. */ /* Ask the kernel to allocate an IRQ. */
irq = create_irq(); irq = irq_alloc_hwirq(-1);
if (irq < 0) { if (!irq) {
pr_err("PCI: no free irq vectors, failed for %d\n", i); pr_err("PCI: no free irq vectors, failed for %d\n", i);
goto free_irqs; goto free_irqs;
} }
controller->irq_intx_table[i] = irq; controller->irq_intx_table[i] = irq;
...@@ -382,7 +381,7 @@ static int tile_init_irqs(struct pci_controller *controller) ...@@ -382,7 +381,7 @@ static int tile_init_irqs(struct pci_controller *controller)
free_irqs: free_irqs:
for (j = 0; j < i; j++) for (j = 0; j < i; j++)
destroy_irq(controller->irq_intx_table[j]); irq_free_hwirq(controller->irq_intx_table[j]);
return -1; return -1;
} }
...@@ -1500,9 +1499,9 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc) ...@@ -1500,9 +1499,9 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
int irq; int irq;
int ret; int ret;
irq = create_irq(); irq = irq_alloc_hwirq(-1);
if (irq < 0) if (!irq)
return irq; return -ENOSPC;
/* /*
* Since we use a 64-bit Mem-Map to accept the MSI write, we fail * Since we use a 64-bit Mem-Map to accept the MSI write, we fail
...@@ -1601,11 +1600,11 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc) ...@@ -1601,11 +1600,11 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
/* Free mem-map */ /* Free mem-map */
msi_mem_map_alloc_failure: msi_mem_map_alloc_failure:
is_64_failure: is_64_failure:
destroy_irq(irq); irq_free_hwirq(irq);
return ret; return ret;
} }
void arch_teardown_msi_irq(unsigned int irq) void arch_teardown_msi_irq(unsigned int irq)
{ {
destroy_irq(irq); irq_free_hwirq(irq);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment