1 files changed, 34 insertions, 26 deletions

diff --git a/cpukit/rtems/src/schedulerident.c b/cpukit/rtems/src/schedulerident.c
index bc8ada39df..015de440bc 100644
--- a/cpukit/rtems/src/schedulerident.c
+++ b/cpukit/rtems/src/schedulerident.c
@@ -1,31 +1,44 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /**
  * @file
  *
- * @ingroup RTEMSImplClassic
+ * @ingroup RTEMSImplClassicScheduler
  *
  * @brief This source file contains the implementation of
  *   rtems_scheduler_ident().
  */
 
 /*
- * Copyright (c) 2014 embedded brains GmbH.  All rights reserved.
+ * Copyright (C) 2014, 2022 embedded brains GmbH & Co. KG
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems@embedded-brains.de>
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
  *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <rtems/rtems/tasks.h>
+#include <rtems/rtems/scheduler.h>
 #include <rtems/score/schedulerimpl.h>
 
 rtems_status_code rtems_scheduler_ident(
@@ -33,25 +46,20 @@ rtems_status_code rtems_scheduler_ident(
   rtems_id   *id
 )
 {
-  rtems_status_code sc;
-
-  if ( id != NULL ) {
-    size_t n = _Scheduler_Count;
-    size_t i;
+  size_t i;
 
-    sc = RTEMS_INVALID_NAME;
+  if ( id == NULL ) {
+    return RTEMS_INVALID_ADDRESS;
+  }
 
-    for ( i = 0 ; i < n && sc == RTEMS_INVALID_NAME ; ++i ) {
-      const Scheduler_Control *scheduler = &_Scheduler_Table[ i ];
+  for ( i = 0; i < _Scheduler_Count; ++i ) {
+    const Scheduler_Control *scheduler = &_Scheduler_Table[ i ];
 
-      if ( scheduler->name == name ) {
-        *id = _Scheduler_Build_id( i );
-        sc = RTEMS_SUCCESSFUL;
-      }
+    if ( scheduler->name == name ) {
+      *id = _Scheduler_Build_id( i );
+      return RTEMS_SUCCESSFUL;
     }
-  } else {
-    sc = RTEMS_INVALID_ADDRESS;
   }
 
-  return sc;
+  return RTEMS_INVALID_NAME;
 }