aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorJiang Liu <jiang.liu@linux.intel.com>2014-10-27 04:11:54 -0400
committerThomas Gleixner <tglx@linutronix.de>2014-12-16 08:08:16 -0500
commit25d0d35ed7d4ded4ba90e6311c80f2eca65d12f0 (patch)
tree61823581b67a9071b5fdf94b22c054e8fc3f541b /arch/x86/kernel
parentcd68f6bd53cf89d1d5ed889b8af65e9c3574a079 (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/kernel')
-rw-r--r--arch/x86/kernel/apic/io_apic.c13
1 files changed, 3 insertions, 10 deletions
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)
1179 * Find a specific PCI IRQ entry. 1179 * Find a specific PCI IRQ entry.
1180 * Not an __init, possibly needed by modules 1180 * Not an __init, possibly needed by modules
1181 */ 1181 */
1182int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin, 1182int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin)
1183 struct io_apic_irq_attr *irq_attr)
1184{ 1183{
1185 int irq, i, best_ioapic = -1, best_idx = -1; 1184 int irq, i, best_ioapic = -1, best_idx = -1;
1186 1185
@@ -1234,14 +1233,8 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
1234 return -1; 1233 return -1;
1235 1234
1236out: 1235out:
1237 irq = pin_2_irq(best_idx, best_ioapic, mp_irqs[best_idx].dstirq, 1236 return pin_2_irq(best_idx, best_ioapic, mp_irqs[best_idx].dstirq,
1238 IOAPIC_MAP_ALLOC); 1237 IOAPIC_MAP_ALLOC);
1239 if (irq > 0)
1240 set_io_apic_irq_attr(irq_attr, best_ioapic,
1241 mp_irqs[best_idx].dstirq,
1242 irq_trigger(best_idx),
1243 irq_polarity(best_idx));
1244 return irq;
1245} 1238}
1246EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); 1239EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
1247 1240