Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f04ec30 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: xgifb: vb_setmode: make XGI_LongWait() static 



XGI_LongWait() can be made static. Move the function, so that forward
declaration is not needed.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c0fe602f

drivers/staging/xgifb/vb_setmode.c

+19 −19
Original line number Diff line number Diff line
@@ -6718,6 +6718,25 @@ static void XGI_SetLCDCap_B(unsigned short tempcx, 
						| 0x18)); /* Enable Dither */

}



static void XGI_LongWait(struct vb_device_info *pVBInfo)

{

	unsigned short i;



	i = xgifb_reg_get(pVBInfo->P3c4, 0x1F);



	if (!(i & 0xC0)) {

		for (i = 0; i < 0xFFFF; i++) {

			if (!(inb(pVBInfo->P3da) & 0x08))

				break;

		}



		for (i = 0; i < 0xFFFF; i++) {

			if ((inb(pVBInfo->P3da) & 0x08))

				break;

		}

	}

}



static void SetSpectrum(struct vb_device_info *pVBInfo)

{

	unsigned short index;
@@ -7219,25 +7238,6 @@ unsigned char XGI_BridgeIsOn(struct vb_device_info *pVBInfo) 
	}

}



void XGI_LongWait(struct vb_device_info *pVBInfo)

{

	unsigned short i;



	i = xgifb_reg_get(pVBInfo->P3c4, 0x1F);



	if (!(i & 0xC0)) {

		for (i = 0; i < 0xFFFF; i++) {

			if (!(inb(pVBInfo->P3da) & 0x08))

				break;

		}



		for (i = 0; i < 0xFFFF; i++) {

			if ((inb(pVBInfo->P3da) & 0x08))

				break;

		}

	}

}



static void XGI_VBLongWait(struct vb_device_info *pVBInfo)

{

	unsigned short tempal, temp, i, j;

drivers/staging/xgifb/vb_setmode.h

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ extern void XGI_UnLockCRT2(struct xgi_hw_device_info *HwDeviceExtension, 
			   struct vb_device_info *);

extern void XGI_LockCRT2(struct xgi_hw_device_info *HwDeviceExtension,

			 struct vb_device_info *);

extern void XGI_LongWait(struct vb_device_info *);

extern void XGI_SetCRT2ModeRegs(unsigned short ModeNo,

				struct xgi_hw_device_info *,

				struct vb_device_info *);