diff --git a/arch/risc-v/rv32i/gcc/port_s.S b/arch/risc-v/rv32i/gcc/port_s.S
index 17ae1d3c..36ee2952 100644
--- a/arch/risc-v/rv32i/gcc/port_s.S
+++ b/arch/risc-v/rv32i/gcc/port_s.S
@@ -136,11 +136,6 @@ port_systick_pending_reset:
     addi    sp, sp, 32*REGBYTES
 .endm
 
-.align 2
-context_switch_return:
-irq_context_return:
-    ret
-
 .align 2
 .type port_sched_start, %function
 port_sched_start:
@@ -167,9 +162,7 @@ port_sched_start:
 port_context_switch:
     SAVE_CONTEXT
 
-    // return from port_context_switch as return from a function
-    la      t0,  context_switch_return
-    sw      t0,  0*REGBYTES(sp)
+    sw      ra,  0*REGBYTES(sp)
 
     csrr   t0,  mstatus
     li     t1,  MSTATUS_MPP
@@ -200,9 +193,7 @@ port_context_switch:
 port_irq_context_switch:
     SAVE_CONTEXT
 
-
-    la      t0,  irq_context_return
-    sw      t0,  0*REGBYTES(sp)
+    sw      ra,  0*REGBYTES(sp)
 
     li      t0,  MSTATUS_MPP
     sw     t0,  1*REGBYTES(sp)