From c7b4eca7fa3e311c67d5dd1e62e301b01ed45271 Mon Sep 17 00:00:00 2001 From: Sebastian Huber 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/arm/beagle/irq/irq.c | 4 +--- bsps/arm/csb336/irq/irq.c | 5 +---- bsps/arm/csb337/irq/irq.c | 4 +--- bsps/arm/edb7312/irq/irq.c | 4 +--- bsps/arm/gumstix/irq/irq.c | 4 +--- bsps/arm/lpc24xx/irq/irq.c | 4 +--- bsps/arm/lpc32xx/irq/irq.c | 4 +--- bsps/arm/raspberrypi/irq/irq.c | 3 +-- bsps/arm/rtl22xx/irq/irq.c | 4 +--- bsps/arm/shared/irq/irq-armv7m.c | 4 +--- bsps/arm/smdk2410/irq/irq.c | 4 +--- bsps/arm/tms570/irq/irq.c | 4 +--- 12 files changed, 12 insertions(+), 36 deletions(-) (limited to 'bsps/arm') diff --git a/bsps/arm/beagle/irq/irq.c b/bsps/arm/beagle/irq/irq.c index d892299fbe..29a4e391e8 100644 --- a/bsps/arm/beagle/irq/irq.c +++ b/bsps/arm/beagle/irq/irq.c @@ -163,7 +163,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) { int i; uint32_t intc_ilrx; @@ -183,6 +183,4 @@ rtems_status_code bsp_interrupt_facility_initialize(void) /* Install generic interrupt handler */ arm_cp15_set_exception_handler(ARM_EXCEPTION_IRQ, _ARMV4_Exception_interrupt); arm_cp15_set_vector_base_address(bsp_vector_table_begin); - - return RTEMS_SUCCESSFUL; } diff --git a/bsps/arm/csb336/irq/irq.c b/bsps/arm/csb336/irq/irq.c index 266ca0113f..24a5a9eb57 100644 --- a/bsps/arm/csb336/irq/irq.c +++ b/bsps/arm/csb336/irq/irq.c @@ -88,10 +88,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) { - _CPU_ISR_install_vector(ARM_EXCEPTION_IRQ, _ARMV4_Exception_interrupt, NULL); - - return RTEMS_SUCCESSFUL; } diff --git a/bsps/arm/csb337/irq/irq.c b/bsps/arm/csb337/irq/irq.c index 32f19c7000..19796b0380 100644 --- a/bsps/arm/csb337/irq/irq.c +++ b/bsps/arm/csb337/irq/irq.c @@ -83,7 +83,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) { unsigned long i = 0; @@ -95,6 +95,4 @@ rtems_status_code bsp_interrupt_facility_initialize(void) AIC_CTL_REG(AIC_IDCR) = 0xffffffff; _CPU_ISR_install_vector(ARM_EXCEPTION_IRQ, _ARMV4_Exception_interrupt, NULL); - - return RTEMS_SUCCESSFUL; } diff --git a/bsps/arm/edb7312/irq/irq.c b/bsps/arm/edb7312/irq/irq.c index e039e119e5..d18b7ae197 100644 --- a/bsps/arm/edb7312/irq/irq.c +++ b/bsps/arm/edb7312/irq/irq.c @@ -125,7 +125,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) { uint32_t int_stat = 0; @@ -221,6 +221,4 @@ rtems_status_code bsp_interrupt_facility_initialize(void) int_stat = *EP7312_INTSR3; _CPU_ISR_install_vector(ARM_EXCEPTION_IRQ, _ARMV4_Exception_interrupt, NULL); - - return RTEMS_SUCCESSFUL; } diff --git a/bsps/arm/gumstix/irq/irq.c b/bsps/arm/gumstix/irq/irq.c index e0f16e17e0..a91bc37971 100644 --- a/bsps/arm/gumstix/irq/irq.c +++ b/bsps/arm/gumstix/irq/irq.c @@ -80,7 +80,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) { /* disable all interrupts */ XSCALE_INT_ICMR = 0x0; @@ -90,6 +90,4 @@ rtems_status_code bsp_interrupt_facility_initialize(void) /* Install the IRQ exception handler */ _CPU_ISR_install_vector(ARM_EXCEPTION_IRQ, _ARMV4_Exception_interrupt, NULL); - - return RTEMS_SUCCESSFUL; } diff --git a/bsps/arm/lpc24xx/irq/irq.c b/bsps/arm/lpc24xx/irq/irq.c index a851db8a7f..ac0ef7c7cb 100644 --- a/bsps/arm/lpc24xx/irq/irq.c +++ b/bsps/arm/lpc24xx/irq/irq.c @@ -120,7 +120,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) { volatile uint32_t *addr = VICVectAddrBase; volatile uint32_t *prio = VICVectPriorityBase; @@ -157,8 +157,6 @@ rtems_status_code bsp_interrupt_facility_initialize(void) /* Install the IRQ exception handler */ _CPU_ISR_install_vector(ARM_EXCEPTION_IRQ, _ARMV4_Exception_interrupt, NULL); - - return RTEMS_SUCCESSFUL; } #endif /* ARM_MULTILIB_ARCH_V4 */ diff --git a/bsps/arm/lpc32xx/irq/irq.c b/bsps/arm/lpc32xx/irq/irq.c index f08d4fe9fb..368ecb906c 100644 --- a/bsps/arm/lpc32xx/irq/irq.c +++ b/bsps/arm/lpc32xx/irq/irq.c @@ -347,7 +347,7 @@ void lpc32xx_set_exception_handler( } } -rtems_status_code bsp_interrupt_facility_initialize(void) +void bsp_interrupt_facility_initialize(void) { size_t i = 0; @@ -385,6 +385,4 @@ rtems_status_code bsp_interrupt_facility_initialize(void) lpc32xx.sic_2.atr = 0x0; lpc32xx_set_exception_handler(ARM_EXCEPTION_IRQ, _ARMV4_Exception_interrupt); - - return RTEMS_SUCCESSFUL; } diff --git a/bsps/arm/raspberrypi/irq/irq.c b/bsps/arm/raspberrypi/irq/irq.c index bd98689087..f3a6528a34 100644 --- a/bsps/arm/raspberrypi/irq/irq.c +++ b/bsps/arm/raspberrypi/irq/irq.c @@ -217,11 +217,10 @@ void bsp_interrupt_handler_default(rtems_vector_number vector) printk("spurious interrupt: %" PRIdrtems_vector_number "\n", vector); } -rtems_status_code bsp_interrupt_facility_initialize(void) +void bsp_interrupt_facility_initialize(void) { BCM2835_REG(BCM2835_IRQ_DISABLE1) = 0xffffffff; BCM2835_REG(BCM2835_IRQ_DISABLE2) = 0xffffffff; BCM2835_REG(BCM2835_IRQ_DISABLE_BASIC) = 0xffffffff; BCM2835_REG(BCM2835_IRQ_FIQ_CTRL) = 0; - return RTEMS_SUCCESSFUL; } diff --git a/bsps/arm/rtl22xx/irq/irq.c b/bsps/arm/rtl22xx/irq/irq.c index fcfe6a66cf..ad9d33ed3e 100644 --- a/bsps/arm/rtl22xx/irq/irq.c +++ b/bsps/arm/rtl22xx/irq/irq.c @@ -82,7 +82,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) { volatile uint32_t *ctrl = (volatile uint32_t *) VICVectCntlBase; size_t i = 0; @@ -109,6 +109,4 @@ rtems_status_code bsp_interrupt_facility_initialize(void) /* Install the IRQ exception handler */ _CPU_ISR_install_vector(ARM_EXCEPTION_IRQ, _ARMV4_Exception_interrupt, NULL); - - return RTEMS_SUCCESSFUL; } diff --git a/bsps/arm/shared/irq/irq-armv7m.c b/bsps/arm/shared/irq/irq-armv7m.c index 8a1fd75a32..2602340e65 100644 --- a/bsps/arm/shared/irq/irq-armv7m.c +++ b/bsps/arm/shared/irq/irq-armv7m.c @@ -94,7 +94,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) { ARMV7M_Exception_handler *vector_table; int i; @@ -118,8 +118,6 @@ rtems_status_code bsp_interrupt_facility_initialize(void) } _ARMV7M_SCB->vtor = vector_table; - - return RTEMS_SUCCESSFUL; } #endif /* ARM_MULTILIB_ARCH_V7M */ diff --git a/bsps/arm/smdk2410/irq/irq.c b/bsps/arm/smdk2410/irq/irq.c index a293dac5c2..1501a94c87 100644 --- a/bsps/arm/smdk2410/irq/irq.c +++ b/bsps/arm/smdk2410/irq/irq.c @@ -81,9 +81,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) { _CPU_ISR_install_vector(ARM_EXCEPTION_IRQ, _ARMV4_Exception_interrupt, NULL); - - return RTEMS_SUCCESSFUL; } diff --git a/bsps/arm/tms570/irq/irq.c b/bsps/arm/tms570/irq/irq.c index e254d4e856..437c1ab27c 100644 --- a/bsps/arm/tms570/irq/irq.c +++ b/bsps/arm/tms570/irq/irq.c @@ -174,7 +174,7 @@ rtems_status_code bsp_interrupt_vector_disable( * * @retval RTEMS_SUCCESSFUL All is set */ -rtems_status_code bsp_interrupt_facility_initialize(void) +void bsp_interrupt_facility_initialize(void) { void (**vim_vec)(void) = (void (**)(void)) 0xFFF82000; unsigned int value = 0x00010203; @@ -241,6 +241,4 @@ rtems_status_code bsp_interrupt_facility_initialize(void) sctlr |= 1 << 24; #endif asm volatile ("mcr p15, 0, %0, c1, c0, 0\n": : "r" (sctlr)); - - return RTEMS_SUCCESSFUL; } -- cgit v1.2.3