openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: xgifb: delete bSkipSense 

bSkipSense is always false, thus redundant.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Aaro Koskinen 2011-03-08 22:16:10 +02:00 committed by Greg Kroah-Hartman
parent 66c2458c79
commit 600a710b8b
2 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/staging/xgifb/vb_init.c
View File

@ -388,34 +388,32 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension)
XGINew_SetReg1(pVBInfo->P3d4, 0x83, 0x00); XGINew_SetReg1(pVBInfo->P3d4, 0x83, 0x00);
printk("181"); printk("181");
if (HwDeviceExtension->bSkipSense == 0) { printk("182");
printk("182");
XGI_SenseCRT1(pVBInfo); XGI_SenseCRT1(pVBInfo);
printk("183"); printk("183");
/* XGINew_DetectMonitor(HwDeviceExtension); */ /* XGINew_DetectMonitor(HwDeviceExtension); */
pVBInfo->IF_DEF_CH7007 = 0; pVBInfo->IF_DEF_CH7007 = 0;
if ((HwDeviceExtension->jChipType == XG21) && (pVBInfo->IF_DEF_CH7007)) { if ((HwDeviceExtension->jChipType == XG21) && (pVBInfo->IF_DEF_CH7007)) {
printk("184"); printk("184");
XGI_GetSenseStatus(HwDeviceExtension, pVBInfo); /* sense CRT2 */ XGI_GetSenseStatus(HwDeviceExtension, pVBInfo); /* sense CRT2 */
printk("185"); printk("185");
} }
if (HwDeviceExtension->jChipType == XG21) { if (HwDeviceExtension->jChipType == XG21) {
printk("186"); printk("186");
XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, ~Monitor1Sense, Monitor1Sense); /* Z9 default has CRT */ XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, ~Monitor1Sense, Monitor1Sense); /* Z9 default has CRT */
temp = GetXG21FPBits(pVBInfo); temp = GetXG21FPBits(pVBInfo);
XGINew_SetRegANDOR(pVBInfo->P3d4, 0x37, ~0x01, temp); XGINew_SetRegANDOR(pVBInfo->P3d4, 0x37, ~0x01, temp);
printk("187"); printk("187");
} }
if (HwDeviceExtension->jChipType == XG27) { if (HwDeviceExtension->jChipType == XG27) {
XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, ~Monitor1Sense, Monitor1Sense); /* Z9 default has CRT */ XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, ~Monitor1Sense, Monitor1Sense); /* Z9 default has CRT */
temp = GetXG27FPBits(pVBInfo); temp = GetXG27FPBits(pVBInfo);
XGINew_SetRegANDOR(pVBInfo->P3d4, 0x37, ~0x03, temp); XGINew_SetRegANDOR(pVBInfo->P3d4, 0x37, ~0x03, temp);
}
} }
printk("19"); printk("19");

2
drivers/staging/xgifb/vgatypes.h
View File

@ -82,8 +82,6 @@ struct xgi_hw_device_info
unsigned char bIntegratedMMEnabled;/* supporting integration MM enable */ unsigned char bIntegratedMMEnabled;/* supporting integration MM enable */
unsigned char bSkipSense;
unsigned char(*pQueryVGAConfigSpace)(struct xgi_hw_device_info *, unsigned char(*pQueryVGAConfigSpace)(struct xgi_hw_device_info *,
unsigned long, unsigned long, unsigned long, unsigned long,
unsigned long *); unsigned long *);