Index: kernel/generic/src/ddi/irq.c
===================================================================
--- kernel/generic/src/ddi/irq.c	(revision 37c312a7ac9843a2f846a0434e94d88f096e94cb)
+++ kernel/generic/src/ddi/irq.c	(revision 4482bc7dd7bb058b7f0db7a9caf5a892cca5a820)
@@ -352,9 +352,10 @@
 /** Unlock IRQ structure after hash_table_remove().
  *
- * @param lnk		Link in the removed and locked IRQ structure.
+ * @param lnk Link in the removed and locked IRQ structure.
  */
 void irq_ht_remove(link_t *lnk)
 {
-	irq_t *irq = hash_table_get_instance(lnk, irq_t, link);
+	irq_t *irq __attribute__((unused))
+	    = hash_table_get_instance(lnk, irq_t, link);
 	spinlock_unlock(&irq->lock);
 }
@@ -425,5 +426,6 @@
 void irq_lin_remove(link_t *lnk)
 {
-	irq_t *irq = hash_table_get_instance(lnk, irq_t, link);
+	irq_t *irq __attribute__((unused))
+	    = hash_table_get_instance(lnk, irq_t, link);
 	spinlock_unlock(&irq->lock);
 }
Index: kernel/generic/src/ipc/irq.c
===================================================================
--- kernel/generic/src/ipc/irq.c	(revision 37c312a7ac9843a2f846a0434e94d88f096e94cb)
+++ kernel/generic/src/ipc/irq.c	(revision 4482bc7dd7bb058b7f0db7a9caf5a892cca5a820)
@@ -129,11 +129,12 @@
 /** Register an answerbox as a receiving end for IRQ notifications.
  *
- * @param box		Receiving answerbox.
- * @param inr		IRQ number.
- * @param devno		Device number.
- * @param method	Method to be associated with the notification.
- * @param ucode		Uspace pointer to top-half pseudocode.
- *
- * @return 		EBADMEM, ENOENT or EEXISTS on failure or 0 on success.
+ * @param box    Receiving answerbox.
+ * @param inr    IRQ number.
+ * @param devno  Device number.
+ * @param method Method to be associated with the notification.
+ * @param ucode  Uspace pointer to top-half pseudocode.
+ *
+ * @return EBADMEM, ENOENT or EEXISTS on failure or 0 on success.
+ *
  */
 int ipc_irq_register(answerbox_t *box, inr_t inr, devno_t devno,
@@ -148,5 +149,5 @@
 		(unative_t) devno
 	};
-
+	
 	if (ucode) {
 		code = code_from_uspace(ucode);
@@ -156,5 +157,5 @@
 		code = NULL;
 	}
-
+	
 	/*
 	 * Allocate and populate the IRQ structure.
@@ -171,5 +172,5 @@
 	irq->notif_cfg.code = code;
 	irq->notif_cfg.counter = 0;
-
+	
 	/*
 	 * Enlist the IRQ structure in the uspace IRQ hash table and the
@@ -180,5 +181,7 @@
 	hlp = hash_table_find(&irq_uspace_hash_table, key);
 	if (hlp) {
-		irq_t *hirq = hash_table_get_instance(hlp, irq_t, link);
+		irq_t *hirq __attribute__((unused))
+		    = hash_table_get_instance(hlp, irq_t, link);
+		
 		/* hirq is locked */
 		spinlock_unlock(&hirq->lock);
@@ -189,5 +192,6 @@
 		return EEXISTS;
 	}
-	spinlock_lock(&irq->lock);	/* not really necessary, but paranoid */
+	
+	spinlock_lock(&irq->lock);  /* Not really necessary, but paranoid */
 	spinlock_lock(&box->irq_lock);
 	hash_table_insert(&irq_uspace_hash_table, key, &irq->link);
@@ -196,5 +200,5 @@
 	spinlock_unlock(&irq->lock);
 	spinlock_unlock(&irq_uspace_hash_table_lock);
-
+	
 	interrupts_restore(ipl);
 	return EOK;