diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 2a7579f2124..913567d9cc5 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -212,13 +212,13 @@ static void uart_poll_notify(FAR uart_dev_t *dev, unsigned int min,
   DEBUGASSERT(max > min && max - min <= CONFIG_SERIAL_NPOLLWAITERS);
 
   flags = enter_critical_section();
-  nxsched_lock_irq();
+  sched_lock();
 
   /* Notify the fds in range dev->fds[min] - dev->fds[max] */
 
   poll_notify(&dev->fds[min], max - min, eventset);
 
-  nxsched_unlock_irq();
+  sched_unlock();
   leave_critical_section(flags);
 }
 
@@ -2148,7 +2148,7 @@ void uart_connected(FAR uart_dev_t *dev, bool connected)
    */
 
   flags = enter_critical_section();
-  nxsched_lock_irq();
+  sched_lock();
   dev->disconnected = !connected;
   if (!connected)
     {
@@ -2169,7 +2169,7 @@ void uart_connected(FAR uart_dev_t *dev, bool connected)
       uart_wakeup(&dev->recvsem);
     }
 
-  nxsched_unlock_irq();
+  sched_unlock();
   leave_critical_section(flags);
 }
 #endif
diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h
index 7247f1f2483..8ac19ec5840 100644
--- a/include/nuttx/sched.h
+++ b/include/nuttx/sched.h
@@ -242,13 +242,6 @@
 #  define this_cpu()                 (0)
 #endif
 
-/* Task Switching Interfaces (non-standard).
- * These two macros can be called in interrupt context.
- */
-
-#define nxsched_lock_irq() (up_interrupt_context() ? OK : sched_lock())
-#define nxsched_unlock_irq() (up_interrupt_context() ? OK : sched_unlock())
-
 /****************************************************************************
  * Public Type Definitions
  ****************************************************************************/