Index: kernel/generic/src/ddi/ddi.c
===================================================================
--- kernel/generic/src/ddi/ddi.c	(revision b3f8fb771f871e7f2bb35ce9339717639e8f86d6)
+++ kernel/generic/src/ddi/ddi.c	(revision 7d307e7eb5d053d50790e7d16579cd967348f4b3)
@@ -131,6 +131,6 @@
 	parea = btree_search(&parea_btree, (btree_key_t) pf, &nodep);
 	if (!parea || parea->frames < pages || ((flags & AS_AREA_CACHEABLE) &&
-		!parea->cacheable) || (!(flags & AS_AREA_CACHEABLE) &&
-		parea->cacheable)) {
+	    !parea->cacheable) || (!(flags & AS_AREA_CACHEABLE) &&
+	    parea->cacheable)) {
 		/*
 		 * This physical memory area cannot be mapped.
@@ -235,10 +235,10 @@
  * @return 0 on success, otherwise it returns error code found in errno.h
  */ 
-unative_t sys_physmem_map(unative_t phys_base, unative_t virt_base, unative_t
-	pages, unative_t flags)
+unative_t sys_physmem_map(unative_t phys_base, unative_t virt_base,
+    unative_t pages, unative_t flags)
 {
 	return (unative_t) ddi_physmem_map(ALIGN_DOWN((uintptr_t) phys_base,
-		FRAME_SIZE), ALIGN_DOWN((uintptr_t) virt_base, PAGE_SIZE),
-		(count_t) pages, (int) flags);
+	    FRAME_SIZE), ALIGN_DOWN((uintptr_t) virt_base, PAGE_SIZE),
+	    (count_t) pages, (int) flags);
 }
 
@@ -259,5 +259,5 @@
 		
 	return (unative_t) ddi_iospace_enable((task_id_t) arg.task_id,
-		(uintptr_t) arg.ioaddr, (size_t) arg.size);
+	    (uintptr_t) arg.ioaddr, (size_t) arg.size);
 }
 
@@ -272,5 +272,5 @@
 unative_t sys_preempt_control(int enable)
 {
-        if (! cap_get(TASK) & CAP_PREEMPT_CONTROL)
+        if (!cap_get(TASK) & CAP_PREEMPT_CONTROL)
                 return EPERM;
         if (enable)
Index: kernel/generic/src/ddi/irq.c
===================================================================
--- kernel/generic/src/ddi/irq.c	(revision b3f8fb771f871e7f2bb35ce9339717639e8f86d6)
+++ kernel/generic/src/ddi/irq.c	(revision 7d307e7eb5d053d50790e7d16579cd967348f4b3)
@@ -303,8 +303,8 @@
 	spinlock_lock(&irq->lock);
 	if (devno == -1) {
-		/* Invoked by irq_dispatch(). */
+		/* Invoked by irq_dispatch_and_lock(). */
 		rv = ((irq->inr == inr) && (irq->claim() == IRQ_ACCEPT));
 	} else {
-		/* Invoked by irq_find(). */
+		/* Invoked by irq_find_and_lock(). */
 		rv = ((irq->inr == inr) && (irq->devno == devno));
 	}
@@ -362,8 +362,8 @@
 	spinlock_lock(&irq->lock);
 	if (devno == -1) {
-		/* Invoked by irq_dispatch() */
+		/* Invoked by irq_dispatch_and_lock() */
 		rv = (irq->claim() == IRQ_ACCEPT);
 	} else {
-		/* Invoked by irq_find() */
+		/* Invoked by irq_find_and_lock() */
 		rv = (irq->devno == devno);
 	}