summaryrefslogtreecommitdiffstats
path: root/drivers/video/sis/init301.c
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2010-12-20 22:50:22 +0100
committerPaul Mundt <lethal@linux-sh.org>2010-12-22 04:57:27 +0100
commit17d6ce11195fceda62af00beefde37e37a01337c (patch)
tree15dd1a717b1cc2f7d23775bd5250bef317872946 /drivers/video/sis/init301.c
parentsisfb: delete unused register I/O macros (diff)
downloadlinux-17d6ce11195fceda62af00beefde37e37a01337c.tar.xz
linux-17d6ce11195fceda62af00beefde37e37a01337c.zip
sisfb: eliminate compiler warnings
Convert some bit masks to 8-bit values to avoid the following compiler warnings: drivers/video/sis/sis_main.c:3858: warning: large integer implicitly truncated to unsigned type drivers/video/sis/init301.c:5855: warning: large integer implicitly truncated to unsigned type drivers/video/sis/init301.c:5869: warning: large integer implicitly truncated to unsigned type Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Cc: Thomas Winischhofer <thomas@winischhofer.net> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/sis/init301.c')
-rw-r--r--drivers/video/sis/init301.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/sis/init301.c b/drivers/video/sis/init301.c
index e24c5ca52dae..a89e3cafd5ad 100644
--- a/drivers/video/sis/init301.c
+++ b/drivers/video/sis/init301.c
@@ -5852,7 +5852,7 @@ SiS_SetGroup1_LVDS(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned s
temp = tempax & 0x00FF;
SiS_SetReg(SiS_Pr->SiS_Part1Port,0x43,temp);
temp = ((tempax & 0xFF00) >> 8) << 3;
- SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x44,~0x0F8,temp);
+ SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port, 0x44, 0x07, temp);
tempax = SiS_Pr->SiS_VDE; /* BDxWadrst1 = BDxWadrst0 + BDxWadroff * VDE */
if(SiS_Pr->SiS_LCDResInfo == Panel_320x240_1 ||
@@ -5866,7 +5866,7 @@ SiS_SetGroup1_LVDS(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned s
temp = ((tempeax & 0xFF0000) >> 16) | 0x10;
SiS_SetReg(SiS_Pr->SiS_Part1Port,0x40,temp);
temp = ((tempeax & 0x01000000) >> 24) << 7;
- SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x3C,~0x080,temp);
+ SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port, 0x3C, 0x7F, temp);
SiS_SetReg(SiS_Pr->SiS_Part1Port,0x2F,0x03);
SiS_SetReg(SiS_Pr->SiS_Part1Port,0x03,0x50);