3 files changed, 10 insertions, 10 deletions
diff --git a/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S b/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S
index f7cc557245..12e6d0c82b 100644
--- a/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S
+++ b/ArmPkg/Library/ArmLib/Common/AArch64/ArmLibSupport.S
@@ -74,16 +74,16 @@ ASM_PFX(ArmWriteCpacr):
 ASM_PFX(ArmWriteAuxCr):
   EL1_OR_EL2(x1)
 1:msr     actlr_el1, x0      // Aux Control Reg (ACTLR) at EL1. Also available in EL2 and EL3
-  b       3f
+  ret
 2:msr     actlr_el2, x0      // Aux Control Reg (ACTLR) at EL1. Also available in EL2 and EL3
-3:ret
+  ret
 
 ASM_PFX(ArmReadAuxCr):
   EL1_OR_EL2(x1)
 1:mrs     x0, actlr_el1      // Aux Control Reg (ACTLR) at EL1. Also available in EL2 and EL3
-  b       3f
+  ret
 2:mrs     x0, actlr_el2      // Aux Control Reg (ACTLR) at EL1. Also available in EL2 and EL3
-3:ret
+  ret
 
 ASM_PFX(ArmSetTTBR0):
   EL1_OR_EL2_OR_EL3(x1)
@@ -185,7 +185,7 @@ ASM_PFX(ArmWriteScr):
   ret
 
 ASM_PFX(ArmWriteMVBar):
-  msr    vbar_el3, x0            // Excpetion Vector Base address for Monitor on EL3
+  msr    vbar_el3, x0            // Exception Vector Base address for Monitor on EL3
   ret
 
 ASM_PFX(ArmCallWFE):
diff --git a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
index 57b205a7a8..a3de902cc6 100644
--- a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
+++ b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
@@ -87,7 +87,7 @@ ASM_PFX(CPSRMaskInsert):    @ on entry, r0 is the mask and r1 is the field to in
   isb
   mov     sp, r3            @ restore stack pointer
   ldmfd   sp!, {r4-r12, lr} @ restore registers
-  bx      lr                @ return (hopefully thumb-safe!)             @ return (hopefully thumb-safe!)
+  bx      lr                @ return (hopefully thumb-safe!)
 
 ASM_PFX(CPSRRead):
   mrs     r0, cpsr
diff --git a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
index a464e4d86c..cb69f71bc7 100644
--- a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
+++ b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.asm
@@ -171,14 +171,14 @@ ArmWriteMVBar
   
 ArmCallWFE
   wfe
-  blx   lr
+  bx      lr
 
 ArmCallSEV
   sev
-  blx   lr
+  bx      lr
 
 ArmReadSctlr
-  mrc     p15, 0, R0, c1, c0, 0      // Read SCTLR into R0 (Read control register configuration data)
-  bx	  lr
+  mrc     p15, 0, r0, c1, c0, 0      // Read SCTLR into R0 (Read control register configuration data)
+  bx	    lr
 
   END