commit d94cb53d6cde6a999d862ae45e1fcd3692675cb4
author hujun5 <hujun5@xiaomi.com> Thu Feb 06 15:06:00 2025 +0800
committer Xiang Xiao <xiaoxiang781216@gmail.com> Tue Nov 11 17:26:30 2025 +0800
tree e32687d162c99cdc6d09043ebb11289b3ee8bdd0
parent 678164bf4e05a87dc1618717a9184bad87b6a0f5

sched_lock: remove the check for whether tcb is NULL

Remove Redundant Checks

Signed-off-by: hujun5 <hujun5@xiaomi.com>

sched/sched/sched_lock.c

diff --git a/sched/sched/sched_lock.c b/sched/sched/sched_lock.c
index d8f75e7..97ae1e9 100644
--- a/sched/sched/sched_lock.c
+++ b/sched/sched/sched_lock.c
@@ -76,13 +76,13 @@
        * integer type.
        */
 
-      DEBUGASSERT(rtcb == NULL || rtcb->lockcount < MAX_LOCK_COUNT);
+      DEBUGASSERT(rtcb && rtcb->lockcount < MAX_LOCK_COUNT);
 
       /* A counter is used to support locking. This allows nested lock
        * operations on this thread (on any CPU)
        */
 
-      if (rtcb != NULL && rtcb->lockcount++ == 0)
+      if (rtcb->lockcount++ == 0)
         {
 #if (CONFIG_SCHED_CRITMONITOR_MAXTIME_PREEMPTION >= 0) || \
     defined(CONFIG_SCHED_INSTRUMENTATION_PREEMPTION)

sched/sched/sched_unlock.c

diff --git a/sched/sched/sched_unlock.c b/sched/sched/sched_unlock.c
index ef76054..da75abe 100644
--- a/sched/sched/sched_unlock.c
+++ b/sched/sched/sched_unlock.c
@@ -64,13 +64,13 @@
 
       /* rtcb may be NULL only during early boot-up phases */
 
-      DEBUGASSERT(rtcb == NULL || rtcb->lockcount > 0);
+      DEBUGASSERT(rtcb && rtcb->lockcount > 0);
 
       /* Check if the lock counter has decremented to zero. If so,
        * then pre-emption has been re-enabled.
        */
 
-      if (rtcb != NULL && rtcb->lockcount == 1)
+      if (rtcb->lockcount == 1)
         {
           irqstate_t flags = enter_critical_section_wo_note();
           FAR struct tcb_s *ptcb;