lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: io_apic: Convert startup to new irq_chip function

Browse Source 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Thomas Gleixner
2010-09-28 16:00:34 +02:00
parent dd5f15e5cf
commit 61a38ce3f5
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2218,11 +2218,10 @@ static int __init timer_irq_works(void)
* an edge even if it isn't on the 8259A... * an edge even if it isn't on the 8259A...
*/ */
static unsigned int startup_ioapic_irq(unsigned int irq) static unsigned int startup_ioapic_irq(struct irq_data *data)
{ {
int was_pending = 0; int was_pending = 0, irq = data->irq;
unsigned long flags; unsigned long flags;
struct irq_cfg *cfg;
raw_spin_lock_irqsave(&ioapic_lock, flags); raw_spin_lock_irqsave(&ioapic_lock, flags);
if (irq < legacy_pic->nr_legacy_irqs) { if (irq < legacy_pic->nr_legacy_irqs) {
@@ -2230,8 +2229,7 @@ static unsigned int startup_ioapic_irq(unsigned int irq)
if (legacy_pic->irq_pending(irq)) if (legacy_pic->irq_pending(irq))
was_pending = 1; was_pending = 1;
} }
cfg = irq_cfg(irq); __unmask_ioapic(data->chip_data);
__unmask_ioapic(cfg);
raw_spin_unlock_irqrestore(&ioapic_lock, flags); raw_spin_unlock_irqrestore(&ioapic_lock, flags);
return was_pending; return was_pending;
@@ -2695,7 +2693,7 @@ static void ir_ack_apic_level(unsigned int irq)
static struct irq_chip ioapic_chip __read_mostly = { static struct irq_chip ioapic_chip __read_mostly = {
.name = "IO-APIC", .name = "IO-APIC",
.startup = startup_ioapic_irq, .irq_startup = startup_ioapic_irq,
.mask = mask_ioapic_irq, .mask = mask_ioapic_irq,
.unmask = unmask_ioapic_irq, .unmask = unmask_ioapic_irq,
.ack = ack_apic_edge, .ack = ack_apic_edge,
@@ -2708,7 +2706,7 @@ static struct irq_chip ioapic_chip __read_mostly = {
static struct irq_chip ir_ioapic_chip __read_mostly = { static struct irq_chip ir_ioapic_chip __read_mostly = {
.name = "IR-IO-APIC", .name = "IR-IO-APIC",
.startup = startup_ioapic_irq, .irq_startup = startup_ioapic_irq,
.mask = mask_ioapic_irq, .mask = mask_ioapic_irq,
.unmask = unmask_ioapic_irq, .unmask = unmask_ioapic_irq,
#ifdef CONFIG_INTR_REMAP #ifdef CONFIG_INTR_REMAP