aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/sis/sis_main.c
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2010-12-20 16:50:15 -0500
committerPaul Mundt <lethal@linux-sh.org>2010-12-21 22:56:57 -0500
commit63e13f8e2b4873b97d78567de8ad4dbcc63740db (patch)
treed8e767d3daac09fc2e217dc225aa7a4d19551048 /drivers/video/sis/sis_main.c
parent1e1687d78bcaba01c7a22ef8564af2029e8e9919 (diff)
sisfb: replace outSISREG with SiS_SetRegByte
Replace outSISREG() with SiS_SetRegByte(). 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/sis_main.c')
-rw-r--r--drivers/video/sis/sis_main.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index 10d190a58bc3..fa8f01c534b5 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -1388,15 +1388,15 @@ sisfb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue,
1388 1388
1389 switch(info->var.bits_per_pixel) { 1389 switch(info->var.bits_per_pixel) {
1390 case 8: 1390 case 8:
1391 outSISREG(SISDACA, regno); 1391 SiS_SetRegByte(SISDACA, regno);
1392 outSISREG(SISDACD, (red >> 10)); 1392 SiS_SetRegByte(SISDACD, (red >> 10));
1393 outSISREG(SISDACD, (green >> 10)); 1393 SiS_SetRegByte(SISDACD, (green >> 10));
1394 outSISREG(SISDACD, (blue >> 10)); 1394 SiS_SetRegByte(SISDACD, (blue >> 10));
1395 if(ivideo->currentvbflags & VB_DISPTYPE_DISP2) { 1395 if(ivideo->currentvbflags & VB_DISPTYPE_DISP2) {
1396 outSISREG(SISDAC2A, regno); 1396 SiS_SetRegByte(SISDAC2A, regno);
1397 outSISREG(SISDAC2D, (red >> 8)); 1397 SiS_SetRegByte(SISDAC2D, (red >> 8));
1398 outSISREG(SISDAC2D, (green >> 8)); 1398 SiS_SetRegByte(SISDAC2D, (green >> 8));
1399 outSISREG(SISDAC2D, (blue >> 8)); 1399 SiS_SetRegByte(SISDAC2D, (blue >> 8));
1400 } 1400 }
1401 break; 1401 break;
1402 case 16: 1402 case 16:
@@ -4999,11 +4999,11 @@ sisfb_post_xgi(struct pci_dev *pdev)
4999 4999
5000 /* VGA enable */ 5000 /* VGA enable */
5001 reg = SiS_GetRegByte(SISVGAENABLE) | 0x01; 5001 reg = SiS_GetRegByte(SISVGAENABLE) | 0x01;
5002 outSISREG(SISVGAENABLE, reg); 5002 SiS_SetRegByte(SISVGAENABLE, reg);
5003 5003
5004 /* Misc */ 5004 /* Misc */
5005 reg = SiS_GetRegByte(SISMISCR) | 0x01; 5005 reg = SiS_GetRegByte(SISMISCR) | 0x01;
5006 outSISREG(SISMISCW, reg); 5006 SiS_SetRegByte(SISMISCW, reg);
5007 5007
5008 /* Unlock SR */ 5008 /* Unlock SR */
5009 outSISIDXREG(SISSR, 0x05, 0x86); 5009 outSISIDXREG(SISSR, 0x05, 0x86);