From c7b4eca7fa3e311c67d5dd1e62e301b01ed45271 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Tue, 27 Jul 2021 09:58:43 +0200
Subject: bsps/irq: bsp_interrupt_facility_initialize()

Do not return a status code in bsp_interrupt_facility_initialize() since this
leads to unreachable code in bsp_interrupt_initialize().  Use RTEMS_DEBUG
assertions in bsp_interrupt_facility_initialize() if necessary.
---
 bsps/powerpc/tqm8xx/irq/irq.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'bsps/powerpc/tqm8xx/irq/irq.c')

diff --git a/bsps/powerpc/tqm8xx/irq/irq.c b/bsps/powerpc/tqm8xx/irq/irq.c
index 42517504b7..1c405037a3 100644
--- a/bsps/powerpc/tqm8xx/irq/irq.c
+++ b/bsps/powerpc/tqm8xx/irq/irq.c
@@ -226,8 +226,10 @@ static int BSP_irq_handle_at_siu( unsigned excNum)
 /*
  * Activate the CPIC
  */
-static rtems_status_code mpc8xx_cpic_initialize( void)
+static void mpc8xx_cpic_initialize( void)
 {
+  rtems_status_code sc;
+
   /*
    * mask off all interrupts
    */
@@ -240,20 +242,19 @@ static rtems_status_code mpc8xx_cpic_initialize( void)
   /*
    * enable CPIC interrupt in SIU interrupt controller
    */
-  return bsp_irq_enable_at_SIU(BSP_CPM_INTERRUPT);
+  sc = bsp_irq_enable_at_SIU(BSP_CPM_INTERRUPT);
+  _Assert_Unused_variable_equals(sc, RTEMS_SUCCESSFUL);
 }
 
 /*
  * Activate the SIU interrupt controller
  */
-static rtems_status_code mpc8xx_siu_int_initialize( void)
+static void mpc8xx_siu_int_initialize( void)
 {
   /*
    * mask off all interrupts
    */
   m8xx.simask = 0;
-
-  return RTEMS_SUCCESSFUL;
 }
 
 static int mpc8xx_exception_handler(BSP_Exception_frame *frame,
@@ -262,16 +263,17 @@ static int mpc8xx_exception_handler(BSP_Exception_frame *frame,
   return BSP_irq_handle_at_siu(exception_number);
 }
 
-rtems_status_code bsp_interrupt_facility_initialize()
+void bsp_interrupt_facility_initialize()
 {
+  rtems_status_code sc;
+
   /* Install exception handler */
-  if (ppc_exc_set_handler(ASM_EXT_VECTOR, mpc8xx_exception_handler)) {
-    return RTEMS_IO_ERROR;
-  }
+  sc = ppc_exc_set_handler(ASM_EXT_VECTOR, mpc8xx_exception_handler);
+  _Assert_Unused_variable_equals(sc, RTEMS_SUCCESSFUL);
+
   /* Initialize the SIU interrupt controller */
-  if (mpc8xx_siu_int_initialize()) {
-    return RTEMS_IO_ERROR;
-  }
+  mpc8xx_siu_int_initialize();
+
   /* Initialize the CPIC interrupt controller */
-  return mpc8xx_cpic_initialize();
+  mpc8xx_cpic_initialize();
 }
-- 
cgit v1.2.3