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.

11 files changed, 63 insertions, 75 deletions

diff --git a/bsps/powerpc/gen5200/irq/irq.c b/bsps/powerpc/gen5200/irq/irq.c
index 9cf78f6a80..4ae79e58a9 100644
--- a/bsps/powerpc/gen5200/irq/irq.c
+++ b/bsps/powerpc/gen5200/irq/irq.c
@@ -745,19 +745,17 @@ static void BSP_SIU_irq_init( void)
   setup_irqMaskTable();
 }
 
-rtems_status_code bsp_interrupt_facility_initialize( void)
+void bsp_interrupt_facility_initialize( void)
 {
+  rtems_status_code sc;
+
   BSP_SIU_irq_init();
 
   /* Install exception handler */
-  if (ppc_exc_set_handler( ASM_EXT_VECTOR, C_dispatch_irq_handler)) {
-    return RTEMS_IO_ERROR;
-  }
-  if (ppc_exc_set_handler( ASM_E300_SYSMGMT_VECTOR, C_dispatch_irq_handler)) {
-    return RTEMS_IO_ERROR;
-  }
-
-  return RTEMS_SUCCESSFUL;
+  sc = ppc_exc_set_handler( ASM_EXT_VECTOR, C_dispatch_irq_handler);
+  _Assert_Unused_variable_equals( sc, RTEMS_SUCCESSFUL);
+  sc = ppc_exc_set_handler( ASM_E300_SYSMGMT_VECTOR, C_dispatch_irq_handler);
+  _Assert_Unused_variable_equals( sc, RTEMS_SUCCESSFUL);
 }
 
 void bsp_interrupt_handler_default( rtems_vector_number vector)
diff --git a/bsps/powerpc/gen83xx/irq/irq.c b/bsps/powerpc/gen83xx/irq/irq.c
index 358c2698a2..4ebea21c60 100644
--- a/bsps/powerpc/gen83xx/irq/irq.c
+++ b/bsps/powerpc/gen83xx/irq/irq.c
@@ -548,20 +548,17 @@ static int BSP_irq_handle_at_ipic( unsigned excNum)
  * Fill the array mpc83xx_ipic_prio2mask to allow masking of lower prio sources
  * to implement nested interrupts.
  */
-static rtems_status_code mpc83xx_ipic_calc_prio2mask(void)
+static void mpc83xx_ipic_calc_prio2mask(void)
 {
-  rtems_status_code rc = RTEMS_SUCCESSFUL;
-
   /*
    * FIXME: fill the array
    */
-  return rc;
 }
 
 /*
  * Activate the interrupt controller
  */
-static rtems_status_code mpc83xx_ipic_initialize(void)
+static void mpc83xx_ipic_initialize(void)
 {
   /*
    * mask off all interrupts
@@ -613,7 +610,7 @@ static rtems_status_code mpc83xx_ipic_initialize(void)
   /*
    * calculate priority masks
    */
-  return mpc83xx_ipic_calc_prio2mask();
+  mpc83xx_ipic_calc_prio2mask();
 }
 
 static int mpc83xx_exception_handler(
@@ -624,19 +621,18 @@ static int mpc83xx_exception_handler(
   return BSP_irq_handle_at_ipic( 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, mpc83xx_exception_handler)) {
-    return RTEMS_IO_ERROR;
-  }
-  if (ppc_exc_set_handler( ASM_E300_SYSMGMT_VECTOR, mpc83xx_exception_handler)) {
-    return RTEMS_IO_ERROR;
-  }
-  if (ppc_exc_set_handler( ASM_E300_CRIT_VECTOR, mpc83xx_exception_handler)) {
-    return RTEMS_IO_ERROR;
-  }
+  sc = ppc_exc_set_handler( ASM_EXT_VECTOR, mpc83xx_exception_handler);
+  _Assert_Unused_variable_equals( sc, RTEMS_SUCCESSFUL);
+  sc = ppc_exc_set_handler( ASM_E300_SYSMGMT_VECTOR, mpc83xx_exception_handler);
+  _Assert_Unused_variable_equals( sc, RTEMS_SUCCESSFUL);
+  sc = ppc_exc_set_handler( ASM_E300_CRIT_VECTOR, mpc83xx_exception_handler);
+  _Assert_Unused_variable_equals( sc, RTEMS_SUCCESSFUL);
 
   /* Initialize the interrupt controller */
-  return mpc83xx_ipic_initialize();
+  mpc83xx_ipic_initialize();
 }
diff --git a/bsps/powerpc/mpc55xxevb/start/irq.c b/bsps/powerpc/mpc55xxevb/start/irq.c
index a4bf712af4..5dee6d74c7 100644
--- a/bsps/powerpc/mpc55xxevb/start/irq.c
+++ b/bsps/powerpc/mpc55xxevb/start/irq.c
@@ -131,7 +131,7 @@ void bsp_interrupt_dispatch(uintptr_t exception_number)
 	INTC.EOIR.R = 1;
 }
 
-rtems_status_code bsp_interrupt_facility_initialize(void)
+void bsp_interrupt_facility_initialize(void)
 {
 	rtems_vector_number vector;
 
@@ -148,8 +148,6 @@ rtems_status_code bsp_interrupt_facility_initialize(void)
 
 	/* Set current priority to 0 */
 	INTC.CPR.B.PRI = 0;
-
-	return RTEMS_SUCCESSFUL;
 }
 
 rtems_status_code bsp_interrupt_get_attributes(
diff --git a/bsps/powerpc/mpc8260ads/irq/irq.c b/bsps/powerpc/mpc8260ads/irq/irq.c
index 9b73979efa..70cb5acf9b 100644
--- a/bsps/powerpc/mpc8260ads/irq/irq.c
+++ b/bsps/powerpc/mpc8260ads/irq/irq.c
@@ -398,21 +398,19 @@ rtems_status_code bsp_interrupt_vector_disable( rtems_vector_number irqnum)
   return RTEMS_SUCCESSFUL;
 }
 
-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, C_dispatch_irq_handler)) {
-    return RTEMS_IO_ERROR;
-  }
-  if (ppc_exc_set_handler( ASM_DEC_VECTOR, C_dispatch_irq_handler)) {
-    return RTEMS_IO_ERROR;
-  }
+  sc = ppc_exc_set_handler( ASM_EXT_VECTOR, C_dispatch_irq_handler);
+  _Assert_Unused_variable_equals( sc, RTEMS_SUCCESSFUL);
+  sc = ppc_exc_set_handler( ASM_DEC_VECTOR, C_dispatch_irq_handler);
+  _Assert_Unused_variable_equals( sc, RTEMS_SUCCESSFUL);
 
   /* Fill in priority masks */
   compute_SIU_IvectMask_from_prio();
 
   /* Initialize the interrupt controller */
   BSP_CPM_irq_init();
-
-  return RTEMS_SUCCESSFUL;
 }
diff --git a/bsps/powerpc/psim/irq/irq_init.c b/bsps/powerpc/psim/irq/irq_init.c
index 97eb00890d..16c30e714d 100644
--- a/bsps/powerpc/psim/irq/irq_init.c
+++ b/bsps/powerpc/psim/irq/irq_init.c
@@ -158,12 +158,11 @@ rtems_status_code bsp_interrupt_vector_disable( rtems_vector_number irqnum)
   return RTEMS_SUCCESSFUL;
 }
 
-rtems_status_code bsp_interrupt_facility_initialize(void)
+void bsp_interrupt_facility_initialize(void)
 {
+  rtems_status_code sc;
+
   /* Install exception handler */
-  if (ppc_exc_set_handler( ASM_EXT_VECTOR, psim_exception_handler)) {
-    return RTEMS_IO_ERROR;
-  }
-  
-  return RTEMS_SUCCESSFUL;
+  sc = ppc_exc_set_handler( ASM_EXT_VECTOR, psim_exception_handler);
+  _Assert_Unused_variable_equals( sc, RTEMS_SUCCESSFUL);
 }
diff --git a/bsps/powerpc/qemuppc/irq/irq_init.c b/bsps/powerpc/qemuppc/irq/irq_init.c
index 5990785fd1..cd85b06c47 100644
--- a/bsps/powerpc/qemuppc/irq/irq_init.c
+++ b/bsps/powerpc/qemuppc/irq/irq_init.c
@@ -94,12 +94,11 @@ rtems_status_code bsp_interrupt_vector_disable( rtems_vector_number irqnum)
   return RTEMS_SUCCESSFUL;
 }
 
-rtems_status_code bsp_interrupt_facility_initialize(void)
+void bsp_interrupt_facility_initialize(void)
 {
-  /* Install exception handler */
-  if (ppc_exc_set_handler( ASM_EXT_VECTOR, qemuppc_exception_handler)) {
-    return RTEMS_IO_ERROR;
-  }
+  rtems_status_code sc;
 
-  return RTEMS_SUCCESSFUL;
+  /* Install exception handler */
+  sc = ppc_exc_set_handler( ASM_EXT_VECTOR, qemuppc_exception_handler);
+  _Assert_Unused_variable_equals( sc, RTEMS_SUCCESSFUL);
 }
diff --git a/bsps/powerpc/qoriq/irq/irq.c b/bsps/powerpc/qoriq/irq/irq.c
index 71a932863d..01e24998ba 100644
--- a/bsps/powerpc/qoriq/irq/irq.c
+++ b/bsps/powerpc/qoriq/irq/irq.c
@@ -181,7 +181,7 @@ void bsp_interrupt_dispatch(uintptr_t exception_number)
 	}
 }
 
-rtems_status_code bsp_interrupt_facility_initialize(void)
+void bsp_interrupt_facility_initialize(void)
 {
 	unsigned int i;
 
@@ -458,7 +458,7 @@ static void pic_global_timer_init(void)
 	}
 }
 
-rtems_status_code bsp_interrupt_facility_initialize(void)
+void bsp_interrupt_facility_initialize(void)
 {
 	rtems_vector_number i = 0;
 	uint32_t processor_id = ppc_processor_id();
@@ -494,8 +494,6 @@ rtems_status_code bsp_interrupt_facility_initialize(void)
 		qoriq.pic.eoi = 0;
 		qoriq.pic.whoami;
 	}
-
-	return RTEMS_SUCCESSFUL;
 }
 
 #endif /* QORIQ_IS_HYPERVISOR_GUEST */
diff --git a/bsps/powerpc/shared/irq/ppc-irq-generic.c b/bsps/powerpc/shared/irq/ppc-irq-generic.c
index 729e92d688..f4b85f7bc0 100644
--- a/bsps/powerpc/shared/irq/ppc-irq-generic.c
+++ b/bsps/powerpc/shared/irq/ppc-irq-generic.c
@@ -151,11 +151,10 @@ rtems_status_code bsp_interrupt_vector_disable(rtems_vector_number vector)
   return RTEMS_SUCCESSFUL;
 }
 
-rtems_status_code bsp_interrupt_facility_initialize(void)
+void bsp_interrupt_facility_initialize(void)
 {
   /*
    * Initialize RTEMS IRQ system
    */
   BSP_rtems_irq_mng_init(0);
-  return RTEMS_SUCCESSFUL;
 }
diff --git a/bsps/powerpc/t32mppc/irq/irq.c b/bsps/powerpc/t32mppc/irq/irq.c
index 30ecfe54d7..bbf97d25b1 100644
--- a/bsps/powerpc/t32mppc/irq/irq.c
+++ b/bsps/powerpc/t32mppc/irq/irq.c
@@ -79,7 +79,7 @@ rtems_status_code bsp_interrupt_vector_disable(rtems_vector_number vector)
 	return RTEMS_SUCCESSFUL;
 }
 
-rtems_status_code bsp_interrupt_facility_initialize(void)
+void bsp_interrupt_facility_initialize(void)
 {
-	return RTEMS_SUCCESSFUL;
+	/* Nothing to do */
 }
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();
 }
diff --git a/bsps/powerpc/virtex/irq/irq_init.c b/bsps/powerpc/virtex/irq/irq_init.c
index 031e59cf9e..e18df51594 100644
--- a/bsps/powerpc/virtex/irq/irq_init.c
+++ b/bsps/powerpc/virtex/irq/irq_init.c
@@ -203,11 +203,12 @@ static int C_dispatch_irq_handler(BSP_Exception_frame *frame, unsigned int excNu
   return 0;
 }
 
-rtems_status_code bsp_interrupt_facility_initialize(void)
+void bsp_interrupt_facility_initialize(void)
 {
-  opb_intc_init();
+  rtems_status_code sc;
 
-  ppc_exc_set_handler(ASM_EXT_VECTOR, C_dispatch_irq_handler);
+  opb_intc_init();
 
-  return RTEMS_SUCCESSFUL;
+  sc = ppc_exc_set_handler(ASM_EXT_VECTOR, C_dispatch_irq_handler);
+  _Assert_Unused_variable_equals(sc, RTEMS_SUCCESSFUL);
 }