Index: kernel/arch/amd64/include/asm.h
===================================================================
--- kernel/arch/amd64/include/asm.h	(revision e64df9a72bbbfdbe211ee53a9c2961e91eed0659)
+++ kernel/arch/amd64/include/asm.h	(revision c22531fc62cd27d622d0595337655d0ea0e4fbc1)
@@ -41,4 +41,6 @@
 #include <trace.h>
 
+#define IO_SPACE_BOUNDARY	((void *) (64 * 1024))
+
 /** Return base address of current stack.
  *
@@ -77,6 +79,4 @@
 }
 
-#define IO_SPACE_BOUNDARY	((void *) (64 * 1024))
-
 /** Byte from port
  *
@@ -91,4 +91,5 @@
 	if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
 		uint8_t val;
+		
 		asm volatile (
 			"inb %w[port], %b[val]\n"
@@ -96,8 +97,8 @@
 			: [port] "d" (port)
 		);
+		
 		return val;
-	} else {
+	} else
 		return (uint8_t) *port;
-	}
 }
 
@@ -114,4 +115,5 @@
 	if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
 		uint16_t val;
+		
 		asm volatile (
 			"inw %w[port], %w[val]\n"
@@ -119,8 +121,8 @@
 			: [port] "d" (port)
 		);
+		
 		return val;
-	} else {
+	} else
 		return (uint16_t) *port;
-	}
 }
 
@@ -137,4 +139,5 @@
 	if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
 		uint32_t val;
+		
 		asm volatile (
 			"inl %w[port], %[val]\n"
@@ -142,8 +145,8 @@
 			: [port] "d" (port)
 		);
+		
 		return val;
-	} else {
+	} else
 		return (uint32_t) *port;
-	}
 }
 
@@ -163,7 +166,6 @@
 			:: [val] "a" (val), [port] "d" (port)
 		);	
-	} else {
+	} else
 		*port = val;
-	}
 }
 
@@ -183,7 +185,6 @@
 			:: [val] "a" (val), [port] "d" (port)
 		);
-	} else {
+	} else
 		*port = val;
-	}
 }
 
@@ -203,7 +204,6 @@
 			:: [val] "a" (val), [port] "d" (port)
 		);
-	} else {
+	} else
 		*port = val;
-	}
 }
 
Index: kernel/arch/ia32/include/asm.h
===================================================================
--- kernel/arch/ia32/include/asm.h	(revision e64df9a72bbbfdbe211ee53a9c2961e91eed0659)
+++ kernel/arch/ia32/include/asm.h	(revision c22531fc62cd27d622d0595337655d0ea0e4fbc1)
@@ -118,7 +118,6 @@
 			:: [val] "a" (val), [port] "d" (port)
 		);	
-	} else {
+	} else
 		*port = val;
-	}
 }
 
@@ -138,7 +137,6 @@
 			:: [val] "a" (val), [port] "d" (port)
 		);
-	} else {
+	} else
 		*port = val;
-	}
 }
 
@@ -158,7 +156,6 @@
 			:: [val] "a" (val), [port] "d" (port)
 		);
-	} else {
+	} else
 		*port = val;
-	}
 }
 
@@ -175,4 +172,5 @@
 	if (((void *)port) < IO_SPACE_BOUNDARY) {
 		uint8_t val;
+		
 		asm volatile (
 			"inb %w[port], %b[val]\n"
@@ -180,8 +178,8 @@
 			: [port] "d" (port)
 		);
+		
 		return val;
-	} else {
+	} else
 		return (uint8_t) *port;
-	}
 }
 
@@ -198,4 +196,5 @@
 	if (((void *)port) < IO_SPACE_BOUNDARY) {
 		uint16_t val;
+		
 		asm volatile (
 			"inw %w[port], %w[val]\n"
@@ -203,8 +202,8 @@
 			: [port] "d" (port)
 		);
+		
 		return val;
-	} else {
+	} else
 		return (uint16_t) *port;
-	}
 }
 
@@ -221,4 +220,5 @@
 	if (((void *)port) < IO_SPACE_BOUNDARY) {
 		uint32_t val;
+		
 		asm volatile (
 			"inl %w[port], %[val]\n"
@@ -226,8 +226,8 @@
 			: [port] "d" (port)
 		);
+		
 		return val;
-	} else {
+	} else
 		return (uint32_t) *port;
-	}
 }
 
Index: uspace/lib/c/arch/ia32/include/ddi.h
===================================================================
--- uspace/lib/c/arch/ia32/include/ddi.h	(revision e64df9a72bbbfdbe211ee53a9c2961e91eed0659)
+++ uspace/lib/c/arch/ia32/include/ddi.h	(revision c22531fc62cd27d622d0595337655d0ea0e4fbc1)
@@ -43,4 +43,5 @@
 	if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
 		uint8_t val;
+		
 		asm volatile (
 			"inb %w[port], %b[val]\n"
@@ -48,8 +49,8 @@
 			: [port] "d" (port)
 		);
+		
 		return val;
-	} else {
+	} else
 		return (uint8_t) *port;
-	}
 }
 
@@ -58,4 +59,5 @@
 	if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
 		uint16_t val;
+		
 		asm volatile (
 			"inw %w[port], %w[val]\n"
@@ -63,8 +65,8 @@
 			: [port] "d" (port)
 		);
+		
 		return val;
-	} else {
+	} else
 		return (uint16_t) *port;
-	}
 }
 
@@ -73,4 +75,5 @@
 	if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
 		uint32_t val;
+		
 		asm volatile (
 			"inl %w[port], %[val]\n"
@@ -78,8 +81,8 @@
 			: [port] "d" (port)
 		);
+		
 		return val;
-	} else {
+	} else
 		return (uint32_t) *port;
-	}
 }
 
@@ -91,7 +94,6 @@
 			:: [val] "a" (val), [port] "d" (port)
 		);	
-	} else {
+	} else
 		*port = val;
-	}
 }
 
@@ -103,7 +105,6 @@
 			:: [val] "a" (val), [port] "d" (port)
 		);
-	} else {
+	} else
 		*port = val;
-	}
 }
 
@@ -115,7 +116,6 @@
 			:: [val] "a" (val), [port] "d" (port)
 		);
-	} else {
+	} else
 		*port = val;
-	}
 }