Index: kernel/arch/arm32/src/drivers/gxemul.c
===================================================================
--- kernel/arch/arm32/src/drivers/gxemul.c	(revision 9979acb60a5eb42e08938818e5cc4fd945626555)
+++ kernel/arch/arm32/src/drivers/gxemul.c	(revision 5ad8661e80323e9b4b2ccfb00b9bb2b29608d73f)
@@ -204,5 +204,5 @@
 }
 
-static irq_ownership_t gxemul_claim(void *instance)
+static irq_ownership_t gxemul_claim(irq_t *irq)
 {
 	return IRQ_ACCEPT;
@@ -266,5 +266,5 @@
 }
 
-static irq_ownership_t gxemul_timer_claim(void *instance)
+static irq_ownership_t gxemul_timer_claim(irq_t *irq)
 {
 	return IRQ_ACCEPT;
Index: kernel/arch/ia32/src/drivers/i8254.c
===================================================================
--- kernel/arch/ia32/src/drivers/i8254.c	(revision 9979acb60a5eb42e08938818e5cc4fd945626555)
+++ kernel/arch/ia32/src/drivers/i8254.c	(revision 5ad8661e80323e9b4b2ccfb00b9bb2b29608d73f)
@@ -62,5 +62,5 @@
 static irq_t i8254_irq;
 
-static irq_ownership_t i8254_claim(void *instance)
+static irq_ownership_t i8254_claim(irq_t *irq)
 {
 	return IRQ_ACCEPT;
Index: kernel/arch/ia32/src/smp/apic.c
===================================================================
--- kernel/arch/ia32/src/smp/apic.c	(revision 9979acb60a5eb42e08938818e5cc4fd945626555)
+++ kernel/arch/ia32/src/smp/apic.c	(revision 5ad8661e80323e9b4b2ccfb00b9bb2b29608d73f)
@@ -133,5 +133,5 @@
 }
 
-static irq_ownership_t l_apic_timer_claim(void *instance)
+static irq_ownership_t l_apic_timer_claim(irq_t *irq)
 {
 	return IRQ_ACCEPT;
Index: kernel/arch/ia64/src/drivers/it.c
===================================================================
--- kernel/arch/ia64/src/drivers/it.c	(revision 9979acb60a5eb42e08938818e5cc4fd945626555)
+++ kernel/arch/ia64/src/drivers/it.c	(revision 5ad8661e80323e9b4b2ccfb00b9bb2b29608d73f)
@@ -57,6 +57,6 @@
 static irq_t it_irq;
 
-static irq_ownership_t it_claim(void *);
-static void it_interrupt(irq_t *irq);
+static irq_ownership_t it_claim(irq_t *);
+static void it_interrupt(irq_t *);
 
 /** Initialize Interval Timer. */
@@ -105,5 +105,5 @@
  * @return Always IRQ_ACCEPT.
  */
-irq_ownership_t it_claim(void *instance)
+irq_ownership_t it_claim(irq_t *irq)
 {
 	return IRQ_ACCEPT;
Index: kernel/arch/ia64/src/ski/ski.c
===================================================================
--- kernel/arch/ia64/src/ski/ski.c	(revision 9979acb60a5eb42e08938818e5cc4fd945626555)
+++ kernel/arch/ia64/src/ski/ski.c	(revision 5ad8661e80323e9b4b2ccfb00b9bb2b29608d73f)
@@ -187,5 +187,5 @@
  * @return Always IRQ_DECLINE.
  */
-static irq_ownership_t ski_kbd_claim(void *instance)
+static irq_ownership_t ski_kbd_claim(irq_t *irq)
 {
 	return IRQ_DECLINE;
Index: kernel/arch/mips32/src/drivers/msim.c
===================================================================
--- kernel/arch/mips32/src/drivers/msim.c	(revision 9979acb60a5eb42e08938818e5cc4fd945626555)
+++ kernel/arch/mips32/src/drivers/msim.c	(revision 5ad8661e80323e9b4b2ccfb00b9bb2b29608d73f)
@@ -110,5 +110,5 @@
 }
 
-static irq_ownership_t msim_claim(void *instance)
+static irq_ownership_t msim_claim(irq_t *irq)
 {
 	return IRQ_ACCEPT;
Index: kernel/arch/mips32/src/drivers/serial.c
===================================================================
--- kernel/arch/mips32/src/drivers/serial.c	(revision 9979acb60a5eb42e08938818e5cc4fd945626555)
+++ kernel/arch/mips32/src/drivers/serial.c	(revision 5ad8661e80323e9b4b2ccfb00b9bb2b29608d73f)
@@ -121,5 +121,5 @@
 }
 
-static irq_ownership_t serial_claim(void *instance)
+static irq_ownership_t serial_claim(irq_t *irq)
 {
 	return IRQ_ACCEPT;
Index: kernel/arch/mips32/src/interrupt.c
===================================================================
--- kernel/arch/mips32/src/interrupt.c	(revision 9979acb60a5eb42e08938818e5cc4fd945626555)
+++ kernel/arch/mips32/src/interrupt.c	(revision 5ad8661e80323e9b4b2ccfb00b9bb2b29608d73f)
@@ -102,5 +102,5 @@
 }
 
-static irq_ownership_t timer_claim(void *instance)
+static irq_ownership_t timer_claim(irq_t *irq)
 {
 	return IRQ_ACCEPT;
Index: kernel/arch/ppc32/src/drivers/cuda.c
===================================================================
--- kernel/arch/ppc32/src/drivers/cuda.c	(revision 9979acb60a5eb42e08938818e5cc4fd945626555)
+++ kernel/arch/ppc32/src/drivers/cuda.c	(revision 5ad8661e80323e9b4b2ccfb00b9bb2b29608d73f)
@@ -265,5 +265,5 @@
 }
 
-static irq_ownership_t cuda_claim(void *instance)
+static irq_ownership_t cuda_claim(irq_t *irq)
 {
 	return IRQ_ACCEPT;
Index: kernel/arch/sparc64/src/drivers/sgcn.c
===================================================================
--- kernel/arch/sparc64/src/drivers/sgcn.c	(revision 9979acb60a5eb42e08938818e5cc4fd945626555)
+++ kernel/arch/sparc64/src/drivers/sgcn.c	(revision 5ad8661e80323e9b4b2ccfb00b9bb2b29608d73f)
@@ -311,5 +311,5 @@
  * The driver works in polled mode, so no interrupt should be handled by it.
  */
-static irq_ownership_t sgcn_claim(void *instance)
+static irq_ownership_t sgcn_claim(irq_t *irq)
 {
 	return IRQ_DECLINE;