diff --git a/include/nuttx/spinlock.h b/include/nuttx/spinlock.h
index 0e0b84bc18456..195496d5587f4 100644
--- a/include/nuttx/spinlock.h
+++ b/include/nuttx/spinlock.h
@@ -589,7 +589,7 @@ irqstate_t spin_lock_irqsave_wo_note(FAR spinlock_t *lock);
 #if defined(CONFIG_SPINLOCK)
 void spin_unlock_irqrestore(FAR spinlock_t *lock, irqstate_t flags);
 #else
-#  define spin_unlock_irqrestore(l, f) up_irq_restore(f)
+#  define spin_unlock_irqrestore(l, f) ((void)(l), up_irq_restore(f))
 #endif
 
 /****************************************************************************
@@ -599,7 +599,7 @@ void spin_unlock_irqrestore(FAR spinlock_t *lock, irqstate_t flags);
 #if defined(CONFIG_SPINLOCK)
 void spin_unlock_irqrestore_wo_note(FAR spinlock_t *lock, irqstate_t flags);
 #else
-#  define spin_unlock_irqrestore_wo_note(l, f) up_irq_restore(f)
+#  define spin_unlock_irqrestore_wo_note(l, f) ((void)(l), up_irq_restore(f))
 #endif
 
 #if defined(CONFIG_RW_SPINLOCK)
@@ -914,7 +914,7 @@ irqstate_t read_lock_irqsave(FAR rwlock_t *lock);
 #if defined(CONFIG_SPINLOCK)
 void read_unlock_irqrestore(FAR rwlock_t *lock, irqstate_t flags);
 #else
-#  define read_unlock_irqrestore(l, f) up_irq_restore(f)
+#  define read_unlock_irqrestore(l, f) ((void)(l), up_irq_restore(f))
 #endif
 
 /****************************************************************************
@@ -988,7 +988,7 @@ irqstate_t write_lock_irqsave(FAR rwlock_t *lock);
 #if defined(CONFIG_SPINLOCK)
 void write_unlock_irqrestore(FAR rwlock_t *lock, irqstate_t flags);
 #else
-#  define write_unlock_irqrestore(l, f) up_irq_restore(f)
+#  define write_unlock_irqrestore(l, f) ((void)(l), up_irq_restore(f))
 #endif
 
 #endif /* CONFIG_RW_SPINLOCK */
diff --git a/sched/irq/irq_spinlock.c b/sched/irq/irq_spinlock.c
index efbf82023417c..17559b271ee11 100644
--- a/sched/irq/irq_spinlock.c
+++ b/sched/irq/irq_spinlock.c
@@ -196,7 +196,7 @@ void spin_unlock_irqrestore(spinlock_t *lock, irqstate_t flags)
 }
 
 /****************************************************************************
- * Name: spin_lock_irqsave_wo_note
+ * Name: spin_unlock_irqrestore_wo_note
  ****************************************************************************/
 
 void spin_unlock_irqrestore_wo_note(spinlock_t *lock, irqstate_t flags)