lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: xgifb: replace XGINew_GetReg3() with inl()

Browse Source 
Replace XGINew_GetReg3() with inl().

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-13 12:26:19 +02:00
committed by Greg Kroah-Hartman
parent d8ad0a6d29
commit f5b571fa24
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1428,12 +1428,12 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension)
temp1 &= 0x02; temp1 &= 0x02;
if (temp1 == 0x02) { if (temp1 == 0x02) {
XGINew_SetReg4(0xcf8, 0x80000000); XGINew_SetReg4(0xcf8, 0x80000000);
ChipsetID = XGINew_GetReg3(0x0cfc); ChipsetID = inl(0x0cfc);
XGINew_SetReg4(0xcf8, 0x8000002C); XGINew_SetReg4(0xcf8, 0x8000002C);
VendorID = XGINew_GetReg3(0x0cfc); VendorID = inl(0x0cfc);
VendorID &= 0x0000FFFF; VendorID &= 0x0000FFFF;
XGINew_SetReg4(0xcf8, 0x8001002C); XGINew_SetReg4(0xcf8, 0x8001002C);
GraphicVendorID = XGINew_GetReg3(0x0cfc); GraphicVendorID = inl(0x0cfc);
GraphicVendorID &= 0x0000FFFF; GraphicVendorID &= 0x0000FFFF;
if (ChipsetID == 0x7301039) if (ChipsetID == 0x7301039)
@@ -1468,7 +1468,7 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension)
/* Set AGP customize registers (in SetDefAGPRegs) End */ /* Set AGP customize registers (in SetDefAGPRegs) End */
/* [Hsuan]2004/12/14 AGP Input Delay Adjustment on 850 */ /* [Hsuan]2004/12/14 AGP Input Delay Adjustment on 850 */
/* XGINew_SetReg4(0xcf8 , 0x80000000); */ /* XGINew_SetReg4(0xcf8 , 0x80000000); */
/* ChipsetID = XGINew_GetReg3(0x0cfc); */ /* ChipsetID = inl(0x0cfc); */
/* if (ChipsetID == 0x25308086) */ /* if (ChipsetID == 0x25308086) */
/* XGINew_SetReg1(pVBInfo->P3d4, 0x77, 0xF0); */ /* XGINew_SetReg1(pVBInfo->P3d4, 0x77, 0xF0); */

9
drivers/staging/xgifb/vb_util.c
View File

@@ -40,15 +40,6 @@ unsigned char XGINew_GetReg1(unsigned long port, unsigned short index)
return data; return data;
} }
unsigned long XGINew_GetReg3(unsigned long port)
{
unsigned long data;
data = inl(port);
return data;
}
void XGINew_SetRegANDOR(unsigned long Port, unsigned short Index, void XGINew_SetRegANDOR(unsigned long Port, unsigned short Index,
unsigned short DataAND, unsigned short DataOR) unsigned short DataAND, unsigned short DataOR)
{ {

1
drivers/staging/xgifb/vb_util.h
View File

@@ -4,7 +4,6 @@ extern void XGINew_SetReg1(unsigned long, unsigned short, unsigned short);
extern void XGINew_SetReg3(unsigned long, unsigned short); extern void XGINew_SetReg3(unsigned long, unsigned short);
extern unsigned char XGINew_GetReg1(unsigned long, unsigned short); extern unsigned char XGINew_GetReg1(unsigned long, unsigned short);
extern void XGINew_SetReg4(unsigned long, unsigned long); extern void XGINew_SetReg4(unsigned long, unsigned long);
extern unsigned long XGINew_GetReg3(unsigned long);
extern void XGINew_SetRegOR(unsigned long Port,unsigned short Index,unsigned short DataOR); extern void XGINew_SetRegOR(unsigned long Port,unsigned short Index,unsigned short DataOR);
extern void XGINew_SetRegAND(unsigned long Port,unsigned short Index,unsigned short DataAND); extern void XGINew_SetRegAND(unsigned long Port,unsigned short Index,unsigned short DataAND);
extern void XGINew_SetRegANDOR(unsigned long Port,unsigned short Index,unsigned short DataAND,unsigned short DataOR); extern void XGINew_SetRegANDOR(unsigned long Port,unsigned short Index,unsigned short DataAND,unsigned short DataOR);