summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2010-12-20 23:50:15 +0200
committerPaul Mundt <lethal@linux-sh.org>2010-12-22 12:56:57 +0900
commit63e13f8e2b4873b97d78567de8ad4dbcc63740db (patch)
treed8e767d3daac09fc2e217dc225aa7a4d19551048
parent1e1687d78bcaba01c7a22ef8564af2029e8e9919 (diff)
downloadlinux-63e13f8e2b4873b97d78567de8ad4dbcc63740db.tar.gz
linux-63e13f8e2b4873b97d78567de8ad4dbcc63740db.tar.bz2
linux-63e13f8e2b4873b97d78567de8ad4dbcc63740db.zip
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>
-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,
switch(info->var.bits_per_pixel) {
case 8:
- outSISREG(SISDACA, regno);
- outSISREG(SISDACD, (red >> 10));
- outSISREG(SISDACD, (green >> 10));
- outSISREG(SISDACD, (blue >> 10));
+ SiS_SetRegByte(SISDACA, regno);
+ SiS_SetRegByte(SISDACD, (red >> 10));
+ SiS_SetRegByte(SISDACD, (green >> 10));
+ SiS_SetRegByte(SISDACD, (blue >> 10));
if(ivideo->currentvbflags & VB_DISPTYPE_DISP2) {
- outSISREG(SISDAC2A, regno);
- outSISREG(SISDAC2D, (red >> 8));
- outSISREG(SISDAC2D, (green >> 8));
- outSISREG(SISDAC2D, (blue >> 8));
+ SiS_SetRegByte(SISDAC2A, regno);
+ SiS_SetRegByte(SISDAC2D, (red >> 8));
+ SiS_SetRegByte(SISDAC2D, (green >> 8));
+ SiS_SetRegByte(SISDAC2D, (blue >> 8));
}
break;
case 16:
@@ -4999,11 +4999,11 @@ sisfb_post_xgi(struct pci_dev *pdev)
/* VGA enable */
reg = SiS_GetRegByte(SISVGAENABLE) | 0x01;
- outSISREG(SISVGAENABLE, reg);
+ SiS_SetRegByte(SISVGAENABLE, reg);
/* Misc */
reg = SiS_GetRegByte(SISMISCR) | 0x01;
- outSISREG(SISMISCW, reg);
+ SiS_SetRegByte(SISMISCW, reg);
/* Unlock SR */
outSISIDXREG(SISSR, 0x05, 0x86);