staging: sm750fb: change definition of CRT_AUTO_CENTERING_BR fields

Use stratight-forward definition of CRT_AUTO_CENTERING_BR register fields
and use open-coded implementation for register manipulation

Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/sm750fb/ddk750_mode.c b/drivers/staging/sm750fb/ddk750_mode.c
index 9e76218..6c6a5c9 100644 (file)
--- a/drivers/staging/sm750fb/ddk750_mode.c
+++ b/drivers/staging/sm750fb/ddk750_mode.c
@@ -28,8 +28,9 @@ static unsigned long displayControlAdjust_SM750LE(mode_parameter_t *pModeParam,
        POKE32(CRT_AUTO_CENTERING_TL, 0);
 
        POKE32(CRT_AUTO_CENTERING_BR,
-       FIELD_VALUE(0, CRT_AUTO_CENTERING_BR, BOTTOM, y - 1)
-       | FIELD_VALUE(0, CRT_AUTO_CENTERING_BR, RIGHT, x - 1));
+               (((y - 1) << CRT_AUTO_CENTERING_BR_BOTTOM_SHIFT) &
+                       CRT_AUTO_CENTERING_BR_BOTTOM_MASK) |
+               ((x - 1) & CRT_AUTO_CENTERING_BR_RIGHT_MASK));
 
        /* Assume common fields in dispControl have been properly set before
           calling this function.

diff --git a/drivers/staging/sm750fb/ddk750_reg.h b/drivers/staging/sm750fb/ddk750_reg.h
index 1d8d577..990d4e3 100644 (file)
--- a/drivers/staging/sm750fb/ddk750_reg.h
+++ b/drivers/staging/sm750fb/ddk750_reg.h
@@ -1481,8 +1481,9 @@
     #define CRT_AUTO_CENTERING_TL_LEFT_MASK           0x7ff
 
     #define CRT_AUTO_CENTERING_BR                     0x080284
-    #define CRT_AUTO_CENTERING_BR_BOTTOM              26:16
-    #define CRT_AUTO_CENTERING_BR_RIGHT               10:0
+    #define CRT_AUTO_CENTERING_BR_BOTTOM_MASK         (0x7ff << 16)
+    #define CRT_AUTO_CENTERING_BR_BOTTOM_SHIFT        16
+    #define CRT_AUTO_CENTERING_BR_RIGHT_MASK          0x7ff
 #endif
 
 /* sm750le new register to control panel output */