Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux...

[pandora-kernel.git] / drivers / ide / ide-scan-pci.c

diff --git a/drivers/ide/ide-scan-pci.c b/drivers/ide/ide-scan-pci.c
index 7ffa332..0e79eff 100644 (file)
--- a/drivers/ide/ide-scan-pci.c
+++ b/drivers/ide/ide-scan-pci.c
@@ -81,20 +81,15 @@ static int __init ide_scan_pcidev(struct pci_dev *dev)
  *     module ordering not traditionally ordered.
  */
 
-int __init ide_scan_pcibus(void)
+static int __init ide_scan_pcibus(void)
 {
        struct pci_dev *dev = NULL;
        struct pci_driver *d;
        struct list_head *l, *n;
 
        pre_init = 0;
-       if (!ide_scan_direction)
-               while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)))
-                       ide_scan_pcidev(dev);
-       else
-               while ((dev = pci_get_device_reverse(PCI_ANY_ID, PCI_ANY_ID,
-                                                    dev)))
-                       ide_scan_pcidev(dev);
+       while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)))
+               ide_scan_pcidev(dev);
 
        /*
         *      Hand the drivers over to the PCI layer now we
@@ -107,15 +102,10 @@ int __init ide_scan_pcibus(void)
                if (__pci_register_driver(d, d->driver.owner,
                                          d->driver.mod_name))
                        printk(KERN_ERR "%s: failed to register %s driver\n",
-                                       __FUNCTION__, d->driver.mod_name);
+                                       __func__, d->driver.mod_name);
        }
 
        return 0;
 }
 
-static int __init ide_scan_pci(void)
-{
-       return ide_scan_pcibus();
-}
-
-module_init(ide_scan_pci);
+module_init(ide_scan_pcibus);