Commit 40544b04 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: xgifb: move XGINew_SenseLCD() to vb_init.c 



The function is used only in vb_init.c, so move it there and make
it static.

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

drivers/staging/xgifb/vb_ext.c

+0 −42
Original line number Diff line number Diff line
@@ -13,45 +13,3 @@ 
 *********************** Dynamic Sense ************************

 *************************************************************/

unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *HwDeviceExtension,

		     struct vb_device_info *pVBInfo)

{

	unsigned short temp;



	/* add lcd sense */

	if (HwDeviceExtension->ulCRT2LCDType == LCD_UNKNOWN) {

		return 0;

	} else {

		temp = (unsigned short) HwDeviceExtension->ulCRT2LCDType;

		switch (HwDeviceExtension->ulCRT2LCDType) {

		case LCD_INVALID:

		case LCD_800x600:

		case LCD_1024x768:

		case LCD_1280x1024:

			break;



		case LCD_640x480:

		case LCD_1024x600:

		case LCD_1152x864:

		case LCD_1280x960:

		case LCD_1152x768:

			temp = 0;

			break;



		case LCD_1400x1050:

		case LCD_1280x768:

		case LCD_1600x1200:

			break;



		case LCD_1920x1440:

		case LCD_2048x1536:

			temp = 0;

			break;



		default:

			break;

		}

		xgifb_reg_and_or(pVBInfo->P3d4, 0x36, 0xF0, temp);

		return 1;

	}

}

drivers/staging/xgifb/vb_ext.h

+0 −3
Original line number Diff line number Diff line 
#ifndef _VBEXT_

#define _VBEXT_



extern unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *,

				      struct vb_device_info *pVBInfo);



#endif

drivers/staging/xgifb/vb_init.c

+44 −0
Original line number Diff line number Diff line
@@ -1336,6 +1336,50 @@ static void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension, 


}



static unsigned short XGINew_SenseLCD(struct xgi_hw_device_info

							*HwDeviceExtension,

				      struct vb_device_info *pVBInfo)

{

	unsigned short temp;



	/* add lcd sense */

	if (HwDeviceExtension->ulCRT2LCDType == LCD_UNKNOWN) {

		return 0;

	} else {

		temp = (unsigned short) HwDeviceExtension->ulCRT2LCDType;

		switch (HwDeviceExtension->ulCRT2LCDType) {

		case LCD_INVALID:

		case LCD_800x600:

		case LCD_1024x768:

		case LCD_1280x1024:

			break;



		case LCD_640x480:

		case LCD_1024x600:

		case LCD_1152x864:

		case LCD_1280x960:

		case LCD_1152x768:

			temp = 0;

			break;



		case LCD_1400x1050:

		case LCD_1280x768:

		case LCD_1600x1200:

			break;



		case LCD_1920x1440:

		case LCD_2048x1536:

			temp = 0;

			break;



		default:

			break;

		}

		xgifb_reg_and_or(pVBInfo->P3d4, 0x36, 0xF0, temp);

		return 1;

	}

}



static void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension,

		struct vb_device_info *pVBInfo)

{