Index: kernel/genarch/src/kbd/i8042.c
===================================================================
--- kernel/genarch/src/kbd/i8042.c	(revision dc22844fb0d5ea9ccfad3f1097a7bf38da0c0ef9)
+++ kernel/genarch/src/kbd/i8042.c	(revision 9646159109db804ee73ff4a9fc8359fb3318c3d2)
@@ -127,7 +127,7 @@
 }
 
-static irq_ownership_t i8042_claim(void *instance)
-{
-	i8042_instance_t *i8042_instance = instance;
+static irq_ownership_t i8042_claim(irq_t *irq)
+{
+	i8042_instance_t *i8042_instance = irq->instance;
 	i8042_t *dev = i8042_instance->i8042;
 	if (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK)
Index: kernel/genarch/src/kbd/ns16550.c
===================================================================
--- kernel/genarch/src/kbd/ns16550.c	(revision dc22844fb0d5ea9ccfad3f1097a7bf38da0c0ef9)
+++ kernel/genarch/src/kbd/ns16550.c	(revision 9646159109db804ee73ff4a9fc8359fb3318c3d2)
@@ -157,7 +157,7 @@
 }
 
-irq_ownership_t ns16550_claim(void *instance)
+irq_ownership_t ns16550_claim(irq_t *irq)
 {
-	ns16550_instance_t *ns16550_instance = instance;
+	ns16550_instance_t *ns16550_instance = irq->instance;
 	ns16550_t *dev = ns16550_instance->ns16550;
 
Index: kernel/genarch/src/kbd/z8530.c
===================================================================
--- kernel/genarch/src/kbd/z8530.c	(revision dc22844fb0d5ea9ccfad3f1097a7bf38da0c0ef9)
+++ kernel/genarch/src/kbd/z8530.c	(revision 9646159109db804ee73ff4a9fc8359fb3318c3d2)
@@ -195,5 +195,5 @@
 }
 
-irq_ownership_t z8530_claim(void *instance)
+irq_ownership_t z8530_claim(irq_t *irq)
 {
 	return (z8530_read_a(&z8530, RR0) & RR0_RCA);