mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
staging/xgifb: simplify vga I/O ports handling
XGIfb driver transfers integer port number through several typecasts via pjIOAddress field. Drop that field completely and use vga_base field of xgifb_info directly. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
30b7681615
commit
9a801f252a
4 changed files with 3 additions and 5 deletions
|
@ -1924,7 +1924,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
|
|||
xgifb_info->display2_force = true;
|
||||
}
|
||||
|
||||
XGIRegInit(&xgifb_info->dev_info, (unsigned long)hw_info->pjIOAddress);
|
||||
XGIRegInit(&xgifb_info->dev_info, xgifb_info->vga_base);
|
||||
|
||||
xgifb_reg_set(XGISR, IND_SIS_PASSWORD, SIS_PASSWORD);
|
||||
reg1 = xgifb_reg_get(XGISR, IND_SIS_PASSWORD);
|
||||
|
|
|
@ -1478,7 +1478,7 @@ unsigned char XGIInitNew(struct pci_dev *pdev)
|
|||
|
||||
pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress;
|
||||
|
||||
pVBInfo->BaseAddr = (unsigned long) HwDeviceExtension->pjIOAddress;
|
||||
pVBInfo->BaseAddr = xgifb_info->vga_base;
|
||||
|
||||
/* Newdebugcode(0x99); */
|
||||
|
||||
|
|
|
@ -7387,7 +7387,7 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info,
|
|||
unsigned short ModeIdIndex;
|
||||
struct vb_device_info VBINF;
|
||||
struct vb_device_info *pVBInfo = &VBINF;
|
||||
pVBInfo->BaseAddr = (unsigned long) HwDeviceExtension->pjIOAddress;
|
||||
pVBInfo->BaseAddr = xgifb_info->vga_base;
|
||||
pVBInfo->IF_DEF_LVDS = 0;
|
||||
pVBInfo->IF_DEF_LCDA = 1;
|
||||
|
||||
|
|
|
@ -66,8 +66,6 @@ struct xgi_hw_device_info {
|
|||
unsigned long ulVideoMemorySize; /* size, in bytes, of the
|
||||
memory on the board */
|
||||
|
||||
unsigned char *pjIOAddress; /* base I/O address of VGA ports (0x3B0) */
|
||||
|
||||
unsigned char jChipType; /* Used to Identify Graphics Chip */
|
||||
/* defined in the data structure type */
|
||||
/* "XGI_CHIP_TYPE" */
|
||||
|
|
Loading…
Reference in a new issue