Index: kernel/arch/ia32/src/drivers/i8254.c
===================================================================
--- kernel/arch/ia32/src/drivers/i8254.c	(revision 2d96f4dffc66f5f4b788d135403a80c661ee1d92)
+++ kernel/arch/ia32/src/drivers/i8254.c	(revision 6cd9aa607e6515e17e369c7e888779416251db4d)
@@ -62,10 +62,10 @@
 static irq_t i8254_irq;
 
-static irq_ownership_t i8254_claim(void)
+static irq_ownership_t i8254_claim(void *instance)
 {
 	return IRQ_ACCEPT;
 }
 
-static void i8254_irq_handler(irq_t *irq, void *arg __attribute__((unused)), ...)
+static void i8254_irq_handler(irq_t *irq)
 {
 	/*
Index: kernel/arch/ia32/src/interrupt.c
===================================================================
--- kernel/arch/ia32/src/interrupt.c	(revision 2d96f4dffc66f5f4b788d135403a80c661ee1d92)
+++ kernel/arch/ia32/src/interrupt.c	(revision 6cd9aa607e6515e17e369c7e888779416251db4d)
@@ -189,5 +189,5 @@
 			ack = true;
 		}
-		irq->handler(irq, irq->arg);
+		irq->handler(irq);
 		spinlock_unlock(&irq->lock);
 	} else {
Index: kernel/arch/ia32/src/smp/apic.c
===================================================================
--- kernel/arch/ia32/src/smp/apic.c	(revision 2d96f4dffc66f5f4b788d135403a80c661ee1d92)
+++ kernel/arch/ia32/src/smp/apic.c	(revision 6cd9aa607e6515e17e369c7e888779416251db4d)
@@ -133,10 +133,10 @@
 }
 
-static irq_ownership_t l_apic_timer_claim(void)
+static irq_ownership_t l_apic_timer_claim(void *instance)
 {
 	return IRQ_ACCEPT;
 }
 
-static void l_apic_timer_irq_handler(irq_t *irq, void *arg __attribute__((unused)), ...)
+static void l_apic_timer_irq_handler(irq_t *irq)
 {
 	/*