score: Simplify _Objects_Get_no_protection()

This functions supports only local objects.  Thus, drop the location
parameter which was unused by all callers.

Remove superfluous includes from Classic Region implementation.

1 files changed, 16 insertions, 35 deletions

diff --git a/cpukit/rtems/src/regionreturnsegment.c b/cpukit/rtems/src/regionreturnsegment.c
index aeff1df16c..c7147bbe19 100644
--- a/cpukit/rtems/src/regionreturnsegment.c
+++ b/cpukit/rtems/src/regionreturnsegment.c
@@ -18,53 +18,34 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/support.h>
-#include <rtems/rtems/options.h>
 #include <rtems/rtems/regionimpl.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/apimutex.h>
 
 rtems_status_code rtems_region_return_segment(
   rtems_id  id,
   void     *segment
 )
 {
-  Objects_Locations        location;
-  rtems_status_code        return_status;
-  int                      status;
-  Region_Control          *the_region;
+  rtems_status_code  status;
+  Region_Control    *the_region;
 
   _RTEMS_Lock_allocator();
 
-    the_region = _Region_Get( id, &location );
-    switch ( location ) {
+  the_region = _Region_Get( id );
 
-      case OBJECTS_LOCAL:
-          status = _Region_Free_segment( the_region, segment );
+  if ( the_region != NULL ) {
+     if ( _Region_Free_segment( the_region, segment ) ) {
+       the_region->number_of_used_blocks -= 1;
 
-          if ( !status )
-            return_status = RTEMS_INVALID_ADDRESS;
-          else {
-            the_region->number_of_used_blocks -= 1;
-
-            _Region_Process_queue(the_region); /* unlocks allocator */
-
-            return RTEMS_SUCCESSFUL;
-          }
-        break;
-
-#if defined(RTEMS_MULTIPROCESSING)
-      case OBJECTS_REMOTE:        /* this error cannot be returned */
-#endif
-
-      case OBJECTS_ERROR:
-      default:
-        return_status = RTEMS_INVALID_ID;
-        break;
-    }
+       /* Unlocks allocator */
+       _Region_Process_queue( the_region );
+       return RTEMS_SUCCESSFUL;
+     } else {
+       status = RTEMS_INVALID_ADDRESS;
+     }
+  } else {
+    status = RTEMS_INVALID_ID;
+  }
 
   _RTEMS_Unlock_allocator();
-  return return_status;
+  return status;
 }