2 files changed, 8 insertions, 38 deletions
diff --git a/bsps/shared/dev/clock/clock-simidle.c b/bsps/shared/dev/clock/clock-simidle.c
index def406a1df..c81f894b71 100644
--- a/bsps/shared/dev/clock/clock-simidle.c
+++ b/bsps/shared/dev/clock/clock-simidle.c
@@ -11,17 +11,8 @@
 
 #define CLOCK_VECTOR 0
 
-volatile bool clock_driver_enabled;
-
 #define Clock_driver_support_initialize_hardware() \
-  do { \
-    clock_driver_enabled = true; \
-  } while (0)
-
-#define Clock_driver_support_shutdown_hardware() \
-  do { \
-    clock_driver_enabled = false; \
-  } while (0)
+  do { } while (0)
 
 #define CLOCK_DRIVER_USE_DUMMY_TIMECOUNTER
 
@@ -46,14 +37,12 @@ void *clock_driver_sim_idle_body(
 )
 {
   for( ; ; ) {
-    if ( clock_driver_enabled ) {
-      Per_CPU_Control *cpu = _Thread_Dispatch_disable();
-      _ISR_Nest_level++;
-      rtems_clock_tick();
-      _ISR_Nest_level--;
-      _Thread_Dispatch_enable( cpu );
-      BSP_CLOCK_DRIVER_DELAY();
-    }
+    Per_CPU_Control *cpu = _Thread_Dispatch_disable();
+    _ISR_Nest_level++;
+    rtems_clock_tick();
+    _ISR_Nest_level--;
+    _Thread_Dispatch_enable( cpu );
+    BSP_CLOCK_DRIVER_DELAY();
   }
   return 0;   /* to avoid warning */
 }
diff --git a/bsps/shared/dev/clock/clockimpl.h b/bsps/shared/dev/clock/clockimpl.h
index 6eaa6c94e5..f64d6fb3a1 100644
--- a/bsps/shared/dev/clock/clockimpl.h
+++ b/bsps/shared/dev/clock/clockimpl.h
@@ -110,7 +110,7 @@ static void Clock_driver_timecounter_tick( void )
 volatile uint32_t    Clock_driver_ticks;
 
 #ifdef Clock_driver_support_shutdown_hardware
-void Clock_exit( void );
+#error "Clock_driver_support_shutdown_hardware() is no longer supported"
 #endif
 
 /**
@@ -190,21 +190,6 @@ rtems_isr Clock_isr(
   #endif
 }
 
-#ifdef Clock_driver_support_shutdown_hardware
-/**
- *  @brief Clock_exit
- *
- *  This routine allows the clock driver to exit by masking the interrupt and
- *  disabling the clock's counter.
- */
-void Clock_exit( void )
-{
-  Clock_driver_support_shutdown_hardware();
-
-  /* do not restore old vector */
-}
-#endif
-
 /**
  * @brief Clock_initialize
  *
@@ -245,10 +230,6 @@ rtems_device_driver Clock_initialize(
    */
   Clock_driver_support_initialize_hardware();
 
-#ifdef Clock_driver_support_shutdown_hardware
-  atexit( Clock_exit );
-#endif
-
   /*
    *  If we are counting ISRs per tick, then initialize the counter.
    */