1 files changed, 10 insertions, 10 deletions

diff --git a/arch/blackfin/mach-common/lock.S b/arch/blackfin/mach-common/lock.S
index 386ac8dda076..190edb3cdc84 100644
--- a/arch/blackfin/mach-common/lock.S
+++ b/arch/blackfin/mach-common/lock.S
@@ -43,12 +43,12 @@ ENTRY(_cache_grab_lock)
 
         [--SP]=( R7:0,P5:0 );
 
-        P1.H = (IMEM_CONTROL >> 16);
-        P1.L = (IMEM_CONTROL & 0xFFFF);
-        P5.H = (ICPLB_ADDR0 >> 16);
-        P5.L = (ICPLB_ADDR0 & 0xFFFF);
-        P4.H = (ICPLB_DATA0 >> 16);
-        P4.L = (ICPLB_DATA0 & 0xFFFF);
+        P1.H = HI(IMEM_CONTROL);
+        P1.L = LO(IMEM_CONTROL);
+        P5.H = HI(ICPLB_ADDR0);
+        P5.L = LO(ICPLB_ADDR0);
+        P4.H = HI(ICPLB_DATA0);
+        P4.L = LO(ICPLB_DATA0);
         R7 = R0;
 
         /* If the code of interest already resides in the cache
@@ -167,8 +167,8 @@ ENTRY(_cache_lock)
 
         [--SP]=( R7:0,P5:0 );
 
-        P1.H = (IMEM_CONTROL >> 16);
-        P1.L = (IMEM_CONTROL & 0xFFFF);
+        P1.H = HI(IMEM_CONTROL);
+        P1.L = LO(IMEM_CONTROL);
 
         /* Disable the Interrupts*/
         CLI R3;
@@ -195,8 +195,8 @@ ENDPROC(_cache_lock)
  */
 
 ENTRY(_read_iloc)
-        P1.H = (IMEM_CONTROL >> 16);
-        P1.L = (IMEM_CONTROL & 0xFFFF);
+        P1.H = HI(IMEM_CONTROL);
+        P1.L = LO(IMEM_CONTROL);
         R1 = 0xF;
         R0 = [P1];
         R0 = R0 >> 3;