Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

[karo-tx-linux.git] / drivers / ide / ide-scan-pci.c

diff --git a/drivers/ide/ide-scan-pci.c b/drivers/ide/ide-scan-pci.c
index 98888da1b600d3a4965e2dbc2d041332e5c5cbbc..c3da53e7bb2b481735569832bfe7928b66f26756 100644 (file)
--- a/drivers/ide/ide-scan-pci.c
+++ b/drivers/ide/ide-scan-pci.c
@@ -88,7 +88,7 @@ static int __init ide_scan_pcibus(void)
        struct list_head *l, *n;
 
        pre_init = 0;
-       while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)))
+       for_each_pci_dev(dev)
                ide_scan_pcidev(dev);
 
        /*
@@ -102,7 +102,7 @@ static 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;