8 files changed, 16 insertions, 32 deletions

diff --git a/c/src/lib/libbsp/m68k/av5282/clock/clock.c b/c/src/lib/libbsp/m68k/av5282/clock/clock.c
index 182693fe03..eb01e84c21 100644
--- a/c/src/lib/libbsp/m68k/av5282/clock/clock.c
+++ b/c/src/lib/libbsp/m68k/av5282/clock/clock.c
@@ -22,10 +22,8 @@
 /*
  * Attach clock interrupt handler
  */
-#define Clock_driver_support_install_isr( _new, _old )             \
-    do {                                                           \
-        _old = (rtems_isr_entry)set_vector(_new, CLOCK_VECTOR, 1);  \
-    } while(0)
+#define Clock_driver_support_install_isr( _new ) \
+    set_vector(_new, CLOCK_VECTOR, 1)
 
 /*
  * Turn off the clock
diff --git a/c/src/lib/libbsp/m68k/gen68360/clock/clock.c b/c/src/lib/libbsp/m68k/gen68360/clock/clock.c
index 3b9d4ca293..56fd0e19fa 100644
--- a/c/src/lib/libbsp/m68k/gen68360/clock/clock.c
+++ b/c/src/lib/libbsp/m68k/gen68360/clock/clock.c
@@ -51,10 +51,8 @@ static unsigned long nsec;
 /*
  * Attach clock interrupt handler
  */
-#define Clock_driver_support_install_isr( _new, _old ) \
-    do {                                                          \
-        _old = (rtems_isr_entry)set_vector(_new, CLOCK_VECTOR, 1);  \
-    } while(0)
+#define Clock_driver_support_install_isr( _new ) \
+    set_vector(_new, CLOCK_VECTOR, 1)
 
 /*
  * Turn off the clock
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/clock/clock.c b/c/src/lib/libbsp/m68k/genmcf548x/clock/clock.c
index d0f28c6b72..0b3579e3a0 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/clock/clock.c
+++ b/c/src/lib/libbsp/m68k/genmcf548x/clock/clock.c
@@ -69,10 +69,8 @@
 /*
  * Attach clock interrupt handler
  */
-#define Clock_driver_support_install_isr( _new, _old )                   \
-    do {                                                                 \
-        _old = (rtems_isr_entry)set_vector(_new, CLOCK_IRQ + 64, 1);     \
-    } while(0)
+#define Clock_driver_support_install_isr( _new ) \
+    set_vector(_new, CLOCK_IRQ + 64, 1)
 
 /*
  * Turn off the clock
diff --git a/c/src/lib/libbsp/m68k/mcf52235/clock/clock.c b/c/src/lib/libbsp/m68k/mcf52235/clock/clock.c
index aa0d0b7945..f29a820d57 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/clock/clock.c
+++ b/c/src/lib/libbsp/m68k/mcf52235/clock/clock.c
@@ -49,10 +49,8 @@ static void mcf52235_tc_tick(void)
 /*
  * Attach clock interrupt handler
  */
-#define Clock_driver_support_install_isr( _new, _old )             \
-    do {                                                           \
-        _old = (rtems_isr_entry)set_vector(_new, CLOCK_VECTOR, 1); \
-    } while(0)
+#define Clock_driver_support_install_isr( _new ) \
+  set_vector(_new, CLOCK_VECTOR, 1)
 
 /*
  * Turn off the clock
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/clock/clock.c b/c/src/lib/libbsp/m68k/mcf5225x/clock/clock.c
index cc2f7d11fa..88234f0a3d 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/clock/clock.c
+++ b/c/src/lib/libbsp/m68k/mcf5225x/clock/clock.c
@@ -49,10 +49,8 @@ static void mcf5225x_tc_tick(void)
 /*
  * Attach clock interrupt handler
  */
-#define Clock_driver_support_install_isr( _new, _old )             \
-    do {                                                           \
-        _old = (rtems_isr_entry)set_vector(_new, CLOCK_VECTOR, 1); \
-    } while(0)
+#define Clock_driver_support_install_isr( _new ) \
+  set_vector(_new, CLOCK_VECTOR, 1)
 
 /*
  * Turn off the clock
diff --git a/c/src/lib/libbsp/m68k/mcf5235/clock/clock.c b/c/src/lib/libbsp/m68k/mcf5235/clock/clock.c
index 95b7f37bac..9664fddb6f 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/clock/clock.c
+++ b/c/src/lib/libbsp/m68k/mcf5235/clock/clock.c
@@ -22,10 +22,8 @@
 /*
  * Attach clock interrupt handler
  */
-#define Clock_driver_support_install_isr( _new, _old )             \
-    do {                                                           \
-        _old = (rtems_isr_entry)set_vector(_new, CLOCK_VECTOR, 1);  \
-    } while(0)
+#define Clock_driver_support_install_isr( _new ) \
+    set_vector(_new, CLOCK_VECTOR, 1)
 
 /*
  * Turn off the clock
diff --git a/c/src/lib/libbsp/m68k/mcf5329/clock/clock.c b/c/src/lib/libbsp/m68k/mcf5329/clock/clock.c
index 5f6006e717..f924499ed4 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/clock/clock.c
+++ b/c/src/lib/libbsp/m68k/mcf5329/clock/clock.c
@@ -49,10 +49,8 @@ static void mcf5329_tc_tick(void)
 /*
  * Attach clock interrupt handler
  */
-#define Clock_driver_support_install_isr( _new, _old )             \
-    do {                                                           \
-        _old = (rtems_isr_entry)set_vector(_new, CLOCK_VECTOR, 1); \
-    } while(0)
+#define Clock_driver_support_install_isr( _new ) \
+  set_vector(_new, CLOCK_VECTOR, 1)
 
 /*
  * Turn off the clock
diff --git a/c/src/lib/libbsp/m68k/uC5282/clock/clock.c b/c/src/lib/libbsp/m68k/uC5282/clock/clock.c
index f27c650aa3..5ec0bc4217 100644
--- a/c/src/lib/libbsp/m68k/uC5282/clock/clock.c
+++ b/c/src/lib/libbsp/m68k/uC5282/clock/clock.c
@@ -75,10 +75,8 @@ static void uC5282_tc_tick(void)
 /*
  * Attach clock interrupt handler
  */
-#define Clock_driver_support_install_isr( _new, _old )              \
-    do {                                                            \
-        _old = (rtems_isr_entry)set_vector(_new, CLOCK_VECTOR, 1);  \
-    } while(0)
+#define Clock_driver_support_install_isr( _new ) \
+    set_vector(_new, CLOCK_VECTOR, 1)
 
 /*
  * Turn off the clock