Index: kernel/genarch/src/drivers/dsrln/dsrlnin.c
===================================================================
--- kernel/genarch/src/drivers/dsrln/dsrlnin.c	(revision 1433ecda9b732f3f185f902feb26826ec2496e03)
+++ kernel/genarch/src/drivers/dsrln/dsrlnin.c	(revision f712a858b9463dae30e9eee5ef1ccc54ae618f02)
@@ -56,6 +56,6 @@
 dsrlnin_instance_t *dsrlnin_init(dsrlnin_t *dev, inr_t inr)
 {
-	dsrlnin_instance_t *instance
-	    = malloc(sizeof(dsrlnin_instance_t), FRAME_ATOMIC);
+	dsrlnin_instance_t *instance =
+	    malloc(sizeof(dsrlnin_instance_t), FRAME_ATOMIC);
 	if (instance) {
 		instance->dsrlnin = dev;
Index: kernel/genarch/src/drivers/ega/ega.c
===================================================================
--- kernel/genarch/src/drivers/ega/ega.c	(revision 1433ecda9b732f3f185f902feb26826ec2496e03)
+++ kernel/genarch/src/drivers/ega/ega.c	(revision f712a858b9463dae30e9eee5ef1ccc54ae618f02)
@@ -547,10 +547,10 @@
 	switch (ch) {
 	case '\n':
-		instance->cursor = (instance->cursor + EGA_COLS)
-		    - instance->cursor % EGA_COLS;
+		instance->cursor = (instance->cursor + EGA_COLS) -
+		    instance->cursor % EGA_COLS;
 		break;
 	case '\t':
-		instance->cursor = (instance->cursor + 8)
-		    - instance->cursor % 8;
+		instance->cursor = (instance->cursor + 8) -
+		    instance->cursor % 8;
 		break;
 	case '\b':
Index: kernel/genarch/src/drivers/ns16550/ns16550.c
===================================================================
--- kernel/genarch/src/drivers/ns16550/ns16550.c	(revision 1433ecda9b732f3f185f902feb26826ec2496e03)
+++ kernel/genarch/src/drivers/ns16550/ns16550.c	(revision f712a858b9463dae30e9eee5ef1ccc54ae618f02)
@@ -128,6 +128,6 @@
     cir_t cir, void *cir_arg, outdev_t **output)
 {
-	ns16550_instance_t *instance
-	    = malloc(sizeof(ns16550_instance_t), FRAME_ATOMIC);
+	ns16550_instance_t *instance =
+	    malloc(sizeof(ns16550_instance_t), FRAME_ATOMIC);
 	if (instance) {
 		instance->ns16550 = dev;
Index: kernel/genarch/src/drivers/via-cuda/cuda.c
===================================================================
--- kernel/genarch/src/drivers/via-cuda/cuda.c	(revision 1433ecda9b732f3f185f902feb26826ec2496e03)
+++ kernel/genarch/src/drivers/via-cuda/cuda.c	(revision f712a858b9463dae30e9eee5ef1ccc54ae618f02)
@@ -90,6 +90,6 @@
 cuda_instance_t *cuda_init(cuda_t *dev, inr_t inr, cir_t cir, void *cir_arg)
 {
-	cuda_instance_t *instance
-	    = malloc(sizeof(cuda_instance_t), FRAME_ATOMIC);
+	cuda_instance_t *instance =
+	    malloc(sizeof(cuda_instance_t), FRAME_ATOMIC);
 	if (instance) {
 		instance->cuda = dev;
@@ -168,10 +168,20 @@
 
 	switch (instance->xstate) {
-	case cx_listen: cuda_irq_listen(irq); break;
-	case cx_receive: cuda_irq_receive(irq); break;
-	case cx_rcv_end: cuda_irq_rcv_end(irq, rbuf, &len);
-	    handle = true; break;
-	case cx_send_start: cuda_irq_send_start(irq); break;
-	case cx_send: cuda_irq_send(irq); break;
+	case cx_listen:
+		cuda_irq_listen(irq);
+		break;
+	case cx_receive:
+		cuda_irq_receive(irq);
+		break;
+	case cx_rcv_end:
+		cuda_irq_rcv_end(irq, rbuf, &len);
+		handle = true;
+		break;
+	case cx_send_start:
+		cuda_irq_send_start(irq);
+		break;
+	case cx_send:
+		cuda_irq_send(irq);
+		break;
 	}
 
@@ -314,6 +324,6 @@
 static void cuda_packet_handle(cuda_instance_t *instance, uint8_t *data, size_t len)
 {
-	if (data[0] != 0x00 || data[1] != 0x40 || (data[2] != 0x2c
-		&& data[2] != 0x8c))
+	if (data[0] != 0x00 || data[1] != 0x40 || (data[2] != 0x2c &&
+	    data[2] != 0x8c))
 		return;