Skip to content

Commit

Permalink
staging: xgifb: delete bIntegratedMMEnabled
Browse files Browse the repository at this point in the history
bIntegratedMMEnabled is always true, so the field and checks can be
eliminated.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Aaro Koskinen authored and Greg Kroah-Hartman committed Mar 10, 2011
1 parent 600a710 commit dbbc298
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 19 deletions.
14 changes: 0 additions & 14 deletions drivers/staging/xgifb/XGI_main_26.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions drivers/staging/xgifb/vb_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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; */
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/xgifb/vgatypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);
Expand Down

0 comments on commit dbbc298

Please sign in to comment.