bsp/leon3: Use new IRQ(A)MP register block API

1 files changed, 2 insertions, 6 deletions

diff --git a/bsps/sparc/leon3/start/eirq.c b/bsps/sparc/leon3/start/eirq.c
index 7592b91f72..0dedc66d95 100644
--- a/bsps/sparc/leon3/start/eirq.c
+++ b/bsps/sparc/leon3/start/eirq.c
@@ -109,12 +109,8 @@ rtems_status_code bsp_interrupt_is_pending(
   regs = LEON3_IrqCtrl_Regs;
 
   rtems_interrupt_local_disable(level);
-#if defined(RTEMS_SMP)
   *pending = (grlib_load_32(&regs->ipend) & bit) != 0 ||
     (grlib_load_32(&regs->piforce[rtems_scheduler_get_processor()]) & bit) != 0;
-#else
-  *pending = (grlib_load_32(&regs->ipend) & bit) != 0;
-#endif
   rtems_interrupt_local_enable(level);
   return RTEMS_SUCCESSFUL;
 }
@@ -321,14 +317,14 @@ rtems_status_code bsp_interrupt_vector_disable(rtems_vector_number vector)
   brdcst = grlib_load_32(&regs->brdcst);
   brdcst &= ~bit;
   grlib_store_32(&regs->brdcst, brdcst);
-
-  LEON3_IRQCTRL_RELEASE(&lock_context);
 #else
   cpu_index = _LEON3_Get_current_processor();
   pimask = grlib_load_32(&regs->pimask[cpu_index]);
   pimask &= ~bit;
   grlib_store_32(&regs->pimask[cpu_index], pimask);
 #endif
+
+  LEON3_IRQCTRL_RELEASE(&lock_context);
   return RTEMS_SUCCESSFUL;
 }