diff options
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 9e4929a00832..bf7d6ce9bbb3 100644 --- a/drivers/pci/htirq.c +++ b/drivers/pci/htirq.c | |||
@@ -82,18 +82,6 @@ void unmask_ht_irq(unsigned int irq) | |||
82 | write_ht_irq_msg(irq, &msg); | 82 | write_ht_irq_msg(irq, &msg); |
83 | } | 83 | } |
84 | 84 | ||
85 | static unsigned int build_irq_for_pci_dev(struct pci_dev *dev) | ||
86 | { | ||
87 | unsigned int irq; | ||
88 | |||
89 | irq = dev->bus->number; | ||
90 | irq <<= 8; | ||
91 | irq |= dev->devfn; | ||
92 | irq <<= 12; | ||
93 | |||
94 | return irq; | ||
95 | } | ||
96 | |||
97 | /** | 85 | /** |
98 | * __ht_create_irq - create an irq and attach it to a device. | 86 | * __ht_create_irq - create an irq and attach it to a device. |
99 | * @dev: The hypertransport device to find the irq capability on. | 87 | * @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) | |||
110 | int max_irq; | 98 | int max_irq; |
111 | int pos; | 99 | int pos; |
112 | int irq; | 100 | int irq; |
113 | unsigned int irq_want; | ||
114 | 101 | ||
115 | pos = pci_find_ht_capability(dev, HT_CAPTYPE_IRQ); | 102 | pos = pci_find_ht_capability(dev, HT_CAPTYPE_IRQ); |
116 | if (!pos) | 103 | if (!pos) |
@@ -138,12 +125,8 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update) | |||
138 | cfg->msg.address_lo = 0xffffffff; | 125 | cfg->msg.address_lo = 0xffffffff; |
139 | cfg->msg.address_hi = 0xffffffff; | 126 | cfg->msg.address_hi = 0xffffffff; |
140 | 127 | ||
141 | irq_want= build_irq_for_pci_dev(dev); | ||
142 | #ifdef CONFIG_HAVE_SPARSE_IRQ | ||
143 | irq = create_irq_nr(irq_want + idx); | ||
144 | #else | ||
145 | irq = create_irq(); | 128 | irq = create_irq(); |
146 | #endif | 129 | |
147 | if (irq <= 0) { | 130 | if (irq <= 0) { |
148 | kfree(cfg); | 131 | kfree(cfg); |
149 | return -EBUSY; | 132 | return -EBUSY; |