lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Aaro Koskinen
2011-08-19 22:40:26 +03:00
committed by Greg Kroah-Hartman
parent c39aada692
commit e1521a166d
1 changed files with 267 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/xgifb/XGI_main_26.c
View File

@@ -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;