2 files changed, 5 insertions, 10 deletions
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c
index c0b8905b20..c712d80745 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c
@@ -248,11 +248,8 @@ static void mpc55xx_clock_cleanup(void)
 #define Clock_driver_timecounter_tick() mpc55xx_tc_tick()
 #define Clock_driver_support_initialize_hardware() \
   mpc55xx_clock_initialize()
-#define Clock_driver_support_install_isr(isr, old_isr) \
-  do { \
-    mpc55xx_clock_handler_install(isr); \
-    old_isr = NULL; \
-  } while (0)
+#define Clock_driver_support_install_isr(isr) \
+  mpc55xx_clock_handler_install(isr)
 #define Clock_driver_support_shutdown_hardware() \
   mpc55xx_clock_cleanup()
 
diff --git a/c/src/lib/libbsp/powerpc/qoriq/clock/clock-config.c b/c/src/lib/libbsp/powerpc/qoriq/clock/clock-config.c
index 99e9f973e9..ca61d255d3 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/clock/clock-config.c
+++ b/c/src/lib/libbsp/powerpc/qoriq/clock/clock-config.c
@@ -49,12 +49,10 @@ static volatile qoriq_pic_global_timer *const qoriq_timecounter =
 
 static struct timecounter qoriq_clock_tc;
 
-static void qoriq_clock_handler_install(rtems_isr_entry *old_isr)
+static void qoriq_clock_handler_install(void)
 {
   rtems_status_code sc = RTEMS_SUCCESSFUL;
 
-  *old_isr = NULL;
-
 #if defined(RTEMS_MULTIPROCESSING) && !defined(RTEMS_SMP)
   {
     Processor_mask affinity;
@@ -128,8 +126,8 @@ static void qoriq_clock_cleanup(void)
 #define Clock_driver_support_initialize_hardware() \
   qoriq_clock_initialize()
 
-#define Clock_driver_support_install_isr(clock_isr, old_isr) \
-  qoriq_clock_handler_install(&old_isr)
+#define Clock_driver_support_install_isr(clock_isr) \
+  qoriq_clock_handler_install()
 
 #define Clock_driver_support_set_interrupt_affinity(online_processors) \
   bsp_interrupt_set_affinity(CLOCK_INTERRUPT, online_processors)