Skip to contentSkip to conversation

irqreturn_t conversion

PATCH New Andrey Panin 1 participant 1 message May 28, 2003

lore
Share & tools
lore

Andrey Panin

author
#0 lore raw

PATCH 1/1 irqreturn_t conversion

Hi all,

this small patch (against 2.5.70) updates visws_apic.c in accordance with linux irq handling changes.

Please consider applying.

Best regards.

Signature · 2 lines
Andrey Panin		| Embedded systems software developer
[email protected]		| PGP key: wwwkeys.pgp.net
arch/i386/mach-visws/visws_apic.c +3 -3
diff -urN linux-2.5.70.vanilla/arch/i386/mach-visws/visws_apic.c linux-2.5.70/arch/i386/mach-visws/visws_apic.c
@@ -196,7 +196,7 @@
  * enable_irq gets the right irq. This 'master' irq is never directly
  * 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;
 	irq_desc_t *desc;

@@ -254,11 +254,11 @@
 	if (!(desc->status & IRQ_DISABLED))
 		enable_8259A_irq(realirq);
 
-	return;
+	return IRQ_HANDLED;
 
 out_unlock:
 	spin_unlock_irqrestore(&i8259A_lock, flags);
-	return;
+	return IRQ_NONE;
 }
 
 static struct irqaction master_action = {