4 files changed, 7 insertions, 19 deletions

diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
index 8dbe237bd806..b12c45c5d8ec 100644
--- a/arch/x86/include/asm/hw_irq.h
+++ b/arch/x86/include/asm/hw_irq.h
@@ -162,7 +162,7 @@ static inline void send_cleanup_vector(struct irq_cfg *c) { }
 struct irq_data;
 int __ioapic_set_affinity(struct irq_data *, const struct cpumask *,
                           unsigned int *dest_id);
-extern int IO_APIC_get_PCI_irq_vector(int bus, int devfn, int pin, struct io_apic_irq_attr *irq_attr);
+extern int IO_APIC_get_PCI_irq_vector(int bus, int devfn, int pin);
 extern void setup_ioapic_dest(void);
 
 extern void enable_IO_APIC(void);
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 1cedf410096e..447186a0eeee 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1179,8 +1179,7 @@ void mp_unmap_irq(int irq)
  * Find a specific PCI IRQ entry.
  * Not an __init, possibly needed by modules
  */
-int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
-                                struct io_apic_irq_attr *irq_attr)
+int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin)
 {
         int irq, i, best_ioapic = -1, best_idx = -1;
 
@@ -1234,14 +1233,8 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
                 return -1;
 
 out:
-        irq = pin_2_irq(best_idx, best_ioapic, mp_irqs[best_idx].dstirq,
-                        IOAPIC_MAP_ALLOC);
-        if (irq > 0)
-                set_io_apic_irq_attr(irq_attr, best_ioapic,
-                                     mp_irqs[best_idx].dstirq,
-                                     irq_trigger(best_idx),
-                                     irq_polarity(best_idx));
-        return irq;
+        return pin_2_irq(best_idx, best_ioapic, mp_irqs[best_idx].dstirq,
+                         IOAPIC_MAP_ALLOC);
 }
 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
 
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 99884588a47a..77148eccdf23 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -1200,14 +1200,12 @@ static int pirq_enable_irq(struct pci_dev *dev)
 #ifdef CONFIG_X86_IO_APIC
                         struct pci_dev *temp_dev;
                         int irq;
-                        struct io_apic_irq_attr irq_attr;
 
                         if (dev->irq_managed && dev->irq > 0)
                                 return 0;
 
                         irq = IO_APIC_get_PCI_irq_vector(dev->bus->number,
-                                                PCI_SLOT(dev->devfn),
-                                                pin - 1, &irq_attr);
+                                                PCI_SLOT(dev->devfn), pin - 1);
                         /*
                          * Busses behind bridges are typically not listed in the MP-table.
                          * In this case we have to look up the IRQ based on the parent bus,
@@ -1221,7 +1219,7 @@ static int pirq_enable_irq(struct pci_dev *dev)
                                 pin = pci_swizzle_interrupt_pin(dev, pin);
                                 irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number,
                                                 PCI_SLOT(bridge->devfn),
-                                                pin - 1, &irq_attr);
+                                                pin - 1);
                                 if (irq >= 0)
                                         dev_warn(&dev->dev, "using bridge %s "
                                                  "INT %c to get IRQ %d\n",
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
index 3efaf4c38528..d261e623541f 100644
--- a/drivers/pci/hotplug/ibmphp_core.c
+++ b/drivers/pci/hotplug/ibmphp_core.c
@@ -155,13 +155,10 @@ int ibmphp_init_devno(struct slot **cur_slot)
         for (loop = 0; loop < len; loop++) {
                 if ((*cur_slot)->number == rtable->slots[loop].slot &&
                     (*cur_slot)->bus == rtable->slots[loop].bus) {
-                        struct io_apic_irq_attr irq_attr;
-
                         (*cur_slot)->device = PCI_SLOT(rtable->slots[loop].devfn);
                         for (i = 0; i < 4; i++)
                                 (*cur_slot)->irq[i] = IO_APIC_get_PCI_irq_vector((int) (*cur_slot)->bus,
-                                                (int) (*cur_slot)->device, i,
-                                                &irq_attr);
+                                                (int) (*cur_slot)->device, i);
 
                         debug("(*cur_slot)->irq[0] = %x\n",
                                         (*cur_slot)->irq[0]);