Commit 63e13f8e authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Paul Mundt
Browse files

sisfb: replace outSISREG with SiS_SetRegByte 



Replace outSISREG() with SiS_SetRegByte().

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 1e1687d7

drivers/video/sis/sis_main.c

+10 −10
Original line number Diff line number Diff line
@@ -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);