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

staging: xgifb: probe: delete checks for mode "none" 



The driver does not allow selecting the mode "none", so no need to check
for that in probe.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c39aada6

drivers/staging/xgifb/XGI_main_26.c

+246 −253
Original line number Diff line number Diff line
@@ -2143,15 +2143,12 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, 
		goto error;

	}



	if ((xgifb_mode_idx < 0) ||

	    ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF)) {

	/* Enable PCI_LINEAR_ADDRESSING and MMIO_ENABLE  */

	xgifb_reg_or(XGISR,

		     IND_XGI_PCI_ADDRESS_SET,

		     (XGI_PCI_ADDR_ENABLE | XGI_MEM_MAP_IO_ENABLE));

	/* Enable 2D accelerator engine */

	xgifb_reg_or(XGISR, IND_XGI_MODULE_ENABLE, XGI_ENABLE_2D);

	}



	XGIhw_ext.ulVideoMemorySize = xgi_video_info.video_size;
@@ -2195,8 +2192,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, 


	xgi_video_info.mtrr = (unsigned int) 0;



	if ((xgifb_mode_idx < 0) ||

	    ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF)) {

	xgi_video_info.hasVB = HASVB_NONE;

	if ((xgi_video_info.chip == XG20) ||

	    (xgi_video_info.chip == XG27)) {
@@ -2486,8 +2481,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, 
	printk(KERN_INFO "fb%d: %s frame buffer device, Version %d.%d.%02d\n",

	       fb_info->node, myid, VER_MAJOR, VER_MINOR, VER_LEVEL);



	}



	dumpVGAReg();



	return 0;