Commit a1b4b27a authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] [VISWS] irqreturn_t conversion

From: Andrey Panin <pazke@donpac.ru>

This small patch (against 2.5.70) updates visws_apic.c in accordance
with linux irq handling changes.
parent 1ffc12e2
...@@ -196,7 +196,7 @@ static struct hw_interrupt_type piix4_virtual_irq_type = { ...@@ -196,7 +196,7 @@ static struct hw_interrupt_type piix4_virtual_irq_type = {
* enable_irq gets the right irq. This 'master' irq is never directly * enable_irq gets the right irq. This 'master' irq is never directly
* manipulated by any driver. * manipulated by any driver.
*/ */
static void piix4_master_intr(int irq, void *dev_id, struct pt_regs * regs) static irqreturn_t piix4_master_intr(int irq, void *dev_id, struct pt_regs * regs)
{ {
int realirq; int realirq;
irq_desc_t *desc; irq_desc_t *desc;
...@@ -254,11 +254,11 @@ static void piix4_master_intr(int irq, void *dev_id, struct pt_regs * regs) ...@@ -254,11 +254,11 @@ static void piix4_master_intr(int irq, void *dev_id, struct pt_regs * regs)
if (!(desc->status & IRQ_DISABLED)) if (!(desc->status & IRQ_DISABLED))
enable_8259A_irq(realirq); enable_8259A_irq(realirq);
return; return IRQ_HANDLED;
out_unlock: out_unlock:
spin_unlock_irqrestore(&i8259A_lock, flags); spin_unlock_irqrestore(&i8259A_lock, flags);
return; return IRQ_NONE;
} }
static struct irqaction master_action = { static struct irqaction master_action = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment