Blackfin arch: use HI/LO macros rather than masking the bit ranges ourselves

Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>

1 files changed, 26 insertions, 26 deletions

diff --git a/arch/blackfin/mach-common/cplbmgr.S b/arch/blackfin/mach-common/cplbmgr.S
index 6c256baf087d..cef94c13f956 100644
--- a/arch/blackfin/mach-common/cplbmgr.S
+++ b/arch/blackfin/mach-common/cplbmgr.S
@@ -75,15 +75,15 @@ ENTRY(_cplb_mgr)
         * from the configuration table.
         */
 
-        P4.L = (ICPLB_FAULT_ADDR & 0xFFFF);
-        P4.H = (ICPLB_FAULT_ADDR >> 16);
+        P4.L = LO(ICPLB_FAULT_ADDR);
+        P4.H = HI(ICPLB_FAULT_ADDR);
 
         P1 = 16;
         P5.L = _page_size_table;
         P5.H = _page_size_table;
 
-        P0.L = (ICPLB_DATA0 & 0xFFFF);
-        P0.H = (ICPLB_DATA0 >> 16);
+        P0.L = LO(ICPLB_DATA0);
+        P0.H = HI(ICPLB_DATA0);
         R4 = [P4];              /* Get faulting address*/
         R6 = 64;                /* Advance past the fault address, which*/
         R6 = R6 + R4;           /* we'll use if we find a match*/
@@ -117,13 +117,13 @@ ENTRY(_cplb_mgr)
         I0 = R4;                /* Fault address we'll search for*/
 
         /* set up pointers */
-        P0.L = (ICPLB_DATA0 & 0xFFFF);
-        P0.H = (ICPLB_DATA0 >> 16);
+        P0.L = LO(ICPLB_DATA0);
+        P0.H = HI(ICPLB_DATA0);
 
         /* The replacement procedure for ICPLBs */
 
-        P4.L = (IMEM_CONTROL & 0xFFFF);
-        P4.H = (IMEM_CONTROL >> 16);
+        P4.L = LO(IMEM_CONTROL);
+        P4.H = HI(IMEM_CONTROL);
 
         /* disable cplbs */
         R5 = [P4];              /* Control Register*/
@@ -243,8 +243,8 @@ ENTRY(_cplb_mgr)
          * last entry of the table.
          */
 
-        P1.L = (ICPLB_DATA15 & 0xFFFF);         /* ICPLB_DATA15 */
-        P1.H = (ICPLB_DATA15 >> 16);
+        P1.L = LO(ICPLB_DATA15);                /* ICPLB_DATA15 */
+        P1.H = HI(ICPLB_DATA15);
         [P1] = R2;
         [P1-0x100] = R4;
 #ifdef  CONFIG_CPLB_INFO
@@ -292,10 +292,10 @@ ENTRY(_cplb_mgr)
          * pending writes associated with the CPLB.
          */
 
-        P4.L = (DCPLB_STATUS & 0xFFFF);
-        P4.H = (DCPLB_STATUS >> 16);
-        P3.L = (DCPLB_DATA0 & 0xFFFF);
-        P3.H = (DCPLB_DATA0 >> 16);
+        P4.L = LO(DCPLB_STATUS);
+        P4.H = HI(DCPLB_STATUS);
+        P3.L = LO(DCPLB_DATA0);
+        P3.H = HI(DCPLB_DATA0);
         R5 = [P4];
 
         /* A protection violation can be caused by more than just writes
@@ -355,11 +355,11 @@ ENTRY(_cplb_mgr)
          * config table, that covers the faulting address.
          */
 
-        P1.L = (DCPLB_DATA15 & 0xFFFF);
-        P1.H = (DCPLB_DATA15 >> 16);
+        P1.L = LO(DCPLB_DATA15);
+        P1.H = HI(DCPLB_DATA15);
 
-        P4.L = (DCPLB_FAULT_ADDR & 0xFFFF);
-        P4.H = (DCPLB_FAULT_ADDR >> 16);
+        P4.L = LO(DCPLB_FAULT_ADDR);
+        P4.H = HI(DCPLB_FAULT_ADDR);
         R4 = [P4];
         I0 = R4;
 
@@ -368,8 +368,8 @@ ENTRY(_cplb_mgr)
         R6 = R1;        /* Save for later*/
 
         /* Turn off CPLBs while we work.*/
-        P4.L = (DMEM_CONTROL & 0xFFFF);
-        P4.H = (DMEM_CONTROL >> 16);
+        P4.L = LO(DMEM_CONTROL);
+        P4.H = HI(DMEM_CONTROL);
         R5 = [P4];
         BITCLR(R5,ENDCPLB_P);
         CLI R0;
@@ -384,8 +384,8 @@ ENTRY(_cplb_mgr)
          * are no good.
          */
 
-        I1.L = (DCPLB_DATA0 & 0xFFFF);
-        I1.H = (DCPLB_DATA0 >> 16);
+        I1.L = LO(DCPLB_DATA0);
+        I1.H = HI(DCPLB_DATA0);
         P1 = 2;
         P2 = 16;
         I2.L = _dcplb_preference;
@@ -475,8 +475,8 @@ ENTRY(_cplb_mgr)
          * one space closer to the start.
          */
 
-        R1.L = (DCPLB_DATA16 & 0xFFFF);         /* DCPLB_DATA15 + 4 */
-        R1.H = (DCPLB_DATA16 >> 16);
+        R1.L = LO(DCPLB_DATA16);                /* DCPLB_DATA15 + 4 */
+        R1.H = HI(DCPLB_DATA16);
         R0 = P0;
 
         /* If the victim happens to be in DCPLB15,
@@ -549,8 +549,8 @@ ENTRY(_cplb_mgr)
          * if necessary.
          */
 
-        P1.L = (DCPLB_DATA15 & 0xFFFF);
-        P1.H = (DCPLB_DATA15 >> 16);
+        P1.L = LO(DCPLB_DATA15);
+        P1.H = HI(DCPLB_DATA15);
 
         /* If the DCPLB has cache bits set, but caching hasn't
          * been enabled, then we want to mask off the cache-in-L1