diff options
author | Jiang Liu <jiang.liu@linux.intel.com> | 2014-10-27 04:11:54 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-12-16 08:08:16 -0500 |
commit | 25d0d35ed7d4ded4ba90e6311c80f2eca65d12f0 (patch) | |
tree | 61823581b67a9071b5fdf94b22c054e8fc3f541b /arch/x86/pci/irq.c | |
parent | cd68f6bd53cf89d1d5ed889b8af65e9c3574a079 (diff) |
x86, irq: Kill useless parameter 'irq_attr' of IO_APIC_get_PCI_irq_vector()
None of the callers requires irq_attr to be filled
in. IO_APIC_get_PCI_irq_vector() does not do anything useful with it
either.
Remove the parameter and fixup the call sites.
[ tglx: Massaged changelog ]
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Ryan Desfosses <ryan@desfo.org>
Cc: Quentin Lambert <lambert.quentin@gmail.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: http://lkml.kernel.org/r/1414397531-28254-4-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/pci/irq.c')
-rw-r--r-- | arch/x86/pci/irq.c | 6 |
1 files changed, 2 insertions, 4 deletions
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) | |||
1200 | #ifdef CONFIG_X86_IO_APIC | 1200 | #ifdef CONFIG_X86_IO_APIC |
1201 | struct pci_dev *temp_dev; | 1201 | struct pci_dev *temp_dev; |
1202 | int irq; | 1202 | int irq; |
1203 | struct io_apic_irq_attr irq_attr; | ||
1204 | 1203 | ||
1205 | if (dev->irq_managed && dev->irq > 0) | 1204 | if (dev->irq_managed && dev->irq > 0) |
1206 | return 0; | 1205 | return 0; |
1207 | 1206 | ||
1208 | irq = IO_APIC_get_PCI_irq_vector(dev->bus->number, | 1207 | irq = IO_APIC_get_PCI_irq_vector(dev->bus->number, |
1209 | PCI_SLOT(dev->devfn), | 1208 | PCI_SLOT(dev->devfn), pin - 1); |
1210 | pin - 1, &irq_attr); | ||
1211 | /* | 1209 | /* |
1212 | * Busses behind bridges are typically not listed in the MP-table. | 1210 | * Busses behind bridges are typically not listed in the MP-table. |
1213 | * In this case we have to look up the IRQ based on the parent bus, | 1211 | * 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) | |||
1221 | pin = pci_swizzle_interrupt_pin(dev, pin); | 1219 | pin = pci_swizzle_interrupt_pin(dev, pin); |
1222 | irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, | 1220 | irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, |
1223 | PCI_SLOT(bridge->devfn), | 1221 | PCI_SLOT(bridge->devfn), |
1224 | pin - 1, &irq_attr); | 1222 | pin - 1); |
1225 | if (irq >= 0) | 1223 | if (irq >= 0) |
1226 | dev_warn(&dev->dev, "using bridge %s " | 1224 | dev_warn(&dev->dev, "using bridge %s " |
1227 | "INT %c to get IRQ %d\n", | 1225 | "INT %c to get IRQ %d\n", |