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

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

staging: xgifb: delete bIntegratedMMEnabled 



bIntegratedMMEnabled is always true, so the field and checks can be
eliminated.

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

drivers/staging/xgifb/XGI_main_26.c

+0 −14
Original line number Diff line number Diff line
@@ -2273,20 +2273,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, 
	printk("XGIfb:chipid = %x\n", xgi_video_info.chip);

	XGIhw_ext.jChipType = xgi_video_info.chip;



	switch (xgi_video_info.chip) {

	case XG40:

	case XG41:

	case XG42:

	case XG45:

	case XG20:

	case XG21:

	case XG27:

		XGIhw_ext.bIntegratedMMEnabled = 1;

		break;

	default:

		break;

	}



	if ((xgi_video_info.chip == XG21) || (XGIfb_userom)) {

		XGIhw_ext.pjVirtualRomBase = xgifb_copy_rom(pdev);

		if (XGIhw_ext.pjVirtualRomBase)

drivers/staging/xgifb/vb_init.c

+0 −3
Original line number Diff line number Diff line
@@ -152,9 +152,6 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension) 
	pVBInfo->ISXPDOS = 0;

	printk("3");



	if (!HwDeviceExtension->bIntegratedMMEnabled)

		return 0; /* alan */



	printk("4");



	/* VBIOSVersion[4] = 0x0; */

drivers/staging/xgifb/vgatypes.h

+0 −2
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ struct xgi_hw_device_info 


    unsigned long  ulCRT2LCDType;        /* defined in the data structure type */



    unsigned char bIntegratedMMEnabled;/* supporting integration MM enable */



	unsigned char(*pQueryVGAConfigSpace)(struct xgi_hw_device_info *,

					    unsigned long, unsigned long,

					    unsigned long *);