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

Commit 9a801f25 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Greg Kroah-Hartman
Browse files

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: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 30b76816

drivers/staging/xgifb/XGI_main_26.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/xgifb/vb_init.c

+1 −1
Original line number Diff line number Diff line
@@ -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); */

drivers/staging/xgifb/vb_setmode.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/xgifb/vgatypes.h

+0 −2
Original line number Diff line number Diff line
@@ -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" */