diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-10-15 14:16:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 16:53:15 +0200 |
| commit | 2cc21ef843d4fb7da122239b644a1f6f0aca60a6 (patch) | |
| tree | 5d08e110164176c4011e42d4700ecd0050ad0ce9 /drivers/pci/htirq.c | |
| parent | c6b7674f323622d86316bf7951ad9cae1ce24642 (diff) | |
| download | kernel_goldelico_gta04-2cc21ef843d4fb7da122239b644a1f6f0aca60a6.zip kernel_goldelico_gta04-2cc21ef843d4fb7da122239b644a1f6f0aca60a6.tar.gz kernel_goldelico_gta04-2cc21ef843d4fb7da122239b644a1f6f0aca60a6.tar.bz2 | |
genirq: remove sparse irq code
This code is not ready, but we need to rip it out instead of rebasing
as we would lose the APIC/IO_APIC unification otherwise.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/pci/htirq.c')
| -rw-r--r-- | drivers/pci/htirq.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/pci/htirq.c b/drivers/pci/htirq.c index 9e4929a..bf7d6ce 100644 --- a/drivers/pci/htirq.c +++ b/drivers/pci/htirq.c @@ -82,18 +82,6 @@ void unmask_ht_irq(unsigned int irq) write_ht_irq_msg(irq, &msg); } -static unsigned int build_irq_for_pci_dev(struct pci_dev *dev) -{ - unsigned int irq; - - irq = dev->bus->number; - irq <<= 8; - irq |= dev->devfn; - irq <<= 12; - - return irq; -} - /** * __ht_create_irq - create an irq and attach it to a device. * @dev: The hypertransport device to find the irq capability on. @@ -110,7 +98,6 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update) int max_irq; int pos; int irq; - unsigned int irq_want; pos = pci_find_ht_capability(dev, HT_CAPTYPE_IRQ); if (!pos) @@ -138,12 +125,8 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update) cfg->msg.address_lo = 0xffffffff; cfg->msg.address_hi = 0xffffffff; - irq_want= build_irq_for_pci_dev(dev); -#ifdef CONFIG_HAVE_SPARSE_IRQ - irq = create_irq_nr(irq_want + idx); -#else irq = create_irq(); -#endif + if (irq <= 0) { kfree(cfg); return -EBUSY; |