Commit b618f1aa authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

PCI: remove pci_present() from drivers/char/sx.c

parent 7329dae1
...@@ -2460,7 +2460,6 @@ static int __init sx_init(void) ...@@ -2460,7 +2460,6 @@ static int __init sx_init(void)
} }
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
if (pci_present ()) {
#ifndef TWO_ZERO #ifndef TWO_ZERO
while ((pdev = pci_find_device (PCI_VENDOR_ID_SPECIALIX, while ((pdev = pci_find_device (PCI_VENDOR_ID_SPECIALIX,
PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8, PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8,
...@@ -2471,7 +2470,8 @@ static int __init sx_init(void) ...@@ -2471,7 +2470,8 @@ static int __init sx_init(void)
for (i=0;i< SX_NBOARDS;i++) { for (i=0;i< SX_NBOARDS;i++) {
if (pcibios_find_device (PCI_VENDOR_ID_SPECIALIX, if (pcibios_find_device (PCI_VENDOR_ID_SPECIALIX,
PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8, i, PCI_DEVICE_ID_SPECIALIX_SX_XIO_IO8, i,
&pci_bus, &pci_fun)) break; &pci_bus, &pci_fun))
break;
#endif #endif
/* Specialix has a whole bunch of cards with /* Specialix has a whole bunch of cards with
0x2000 as the device ID. They say its because 0x2000 as the device ID. They say its because
...@@ -2523,7 +2523,6 @@ static int __init sx_init(void) ...@@ -2523,7 +2523,6 @@ static int __init sx_init(void)
} else } else
iounmap ((char *) (board->base)); iounmap ((char *) (board->base));
} }
}
#endif #endif
for (i=0;i<NR_SX_ADDRS;i++) { for (i=0;i<NR_SX_ADDRS;i++) {
...@@ -2649,3 +2648,4 @@ static void __exit sx_exit (void) ...@@ -2649,3 +2648,4 @@ static void __exit sx_exit (void)
module_init(sx_init); module_init(sx_init);
module_exit(sx_exit); module_exit(sx_exit);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment