UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jiang Liu 2014-10-27 16:11:54 +08:00 committed by Thomas Gleixner
parent cd68f6bd53
commit 25d0d35ed7
4 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/hw_irq.h
View File

@ -162,7 +162,7 @@ static inline void send_cleanup_vector(struct irq_cfg *c) { }
struct irq_data; struct irq_data;
int __ioapic_set_affinity(struct irq_data *, const struct cpumask *, int __ioapic_set_affinity(struct irq_data *, const struct cpumask *,
unsigned int *dest_id); 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 setup_ioapic_dest(void);
extern void enable_IO_APIC(void); extern void enable_IO_APIC(void);

13
arch/x86/kernel/apic/io_apic.c
View File

@ -1179,8 +1179,7 @@ void mp_unmap_irq(int irq)
* Find a specific PCI IRQ entry. * Find a specific PCI IRQ entry.
* Not an __init, possibly needed by modules * Not an __init, possibly needed by modules
*/ */
int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin, int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin)
struct io_apic_irq_attr *irq_attr)
{ {
int irq, i, best_ioapic = -1, best_idx = -1; 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; return -1;
out: out:
irq = pin_2_irq(best_idx, best_ioapic, mp_irqs[best_idx].dstirq, return pin_2_irq(best_idx, best_ioapic, mp_irqs[best_idx].dstirq,
IOAPIC_MAP_ALLOC); 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;
} }
EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);

6
arch/x86/pci/irq.c
View File

@ -1200,14 +1200,12 @@ static int pirq_enable_irq(struct pci_dev *dev)
#ifdef CONFIG_X86_IO_APIC #ifdef CONFIG_X86_IO_APIC
struct pci_dev *temp_dev; struct pci_dev *temp_dev;
int irq; int irq;
struct io_apic_irq_attr irq_attr;
if (dev->irq_managed && dev->irq > 0) if (dev->irq_managed && dev->irq > 0)
return 0; return 0;
irq = IO_APIC_get_PCI_irq_vector(dev->bus->number, irq = IO_APIC_get_PCI_irq_vector(dev->bus->number,
PCI_SLOT(dev->devfn), PCI_SLOT(dev->devfn), pin - 1);
pin - 1, &irq_attr);
/* /*
* Busses behind bridges are typically not listed in the MP-table. * 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, * 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); pin = pci_swizzle_interrupt_pin(dev, pin);
irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number,
PCI_SLOT(bridge->devfn), PCI_SLOT(bridge->devfn),
pin - 1, &irq_attr); pin - 1);
if (irq >= 0) if (irq >= 0)
dev_warn(&dev->dev, "using bridge %s " dev_warn(&dev->dev, "using bridge %s "
"INT %c to get IRQ %d\n", "INT %c to get IRQ %d\n",

5
drivers/pci/hotplug/ibmphp_core.c
View File

@ -155,13 +155,10 @@ int ibmphp_init_devno(struct slot **cur_slot)
for (loop = 0; loop < len; loop++) { for (loop = 0; loop < len; loop++) {
if ((*cur_slot)->number == rtable->slots[loop].slot && if ((*cur_slot)->number == rtable->slots[loop].slot &&
(*cur_slot)->bus == rtable->slots[loop].bus) { (*cur_slot)->bus == rtable->slots[loop].bus) {
struct io_apic_irq_attr irq_attr;
(*cur_slot)->device = PCI_SLOT(rtable->slots[loop].devfn); (*cur_slot)->device = PCI_SLOT(rtable->slots[loop].devfn);
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
(*cur_slot)->irq[i] = IO_APIC_get_PCI_irq_vector((int) (*cur_slot)->bus, (*cur_slot)->irq[i] = IO_APIC_get_PCI_irq_vector((int) (*cur_slot)->bus,
(int) (*cur_slot)->device, i, (int) (*cur_slot)->device, i);
&irq_attr);
debug("(*cur_slot)->irq[0] = %x\n", debug("(*cur_slot)->irq[0] = %x\n",
(*cur_slot)->irq[0]); (*cur_slot)->irq[0]);