diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2005-11-07 08:39:35 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-09 21:13:15 +0100 |
| commit | d08fa1a22e4b7240ac081ba57a67ce8e8cf94cc7 (patch) | |
| tree | 6558c5f33c29b27b831efc6051a7056f718510e0 /arch | |
| parent | [PATCH] PCI: pci_find_device remove (frv/mb93090-mb00/pci-frv.c) (diff) | |
| download | linux-d08fa1a22e4b7240ac081ba57a67ce8e8cf94cc7.tar.xz linux-d08fa1a22e4b7240ac081ba57a67ce8e8cf94cc7.zip | |
[PATCH] PCI: pci_find_device remove (sparc64/kernel/ebus.c)
Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc64/kernel/ebus.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c index 6ffbeb701940..7991e919d8ab 100644 --- a/arch/sparc64/kernel/ebus.c +++ b/arch/sparc64/kernel/ebus.c @@ -527,18 +527,12 @@ static struct pci_dev *find_next_ebus(struct pci_dev *start, int *is_rio_p) { struct pci_dev *pdev = start; - do { - pdev = pci_find_device(PCI_VENDOR_ID_SUN, PCI_ANY_ID, pdev); - if (pdev && - (pdev->device == PCI_DEVICE_ID_SUN_EBUS || - pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS)) + while ((pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_ANY_ID, pdev))) + if (pdev->device == PCI_DEVICE_ID_SUN_EBUS || + pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS) break; - } while (pdev != NULL); - if (pdev && (pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS)) - *is_rio_p = 1; - else - *is_rio_p = 0; + *is_rio_p = !!(pdev && (pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS)); return pdev; } @@ -637,6 +631,7 @@ void __init ebus_init(void) ebus->is_rio = is_rio; ++num_ebus; } + pci_dev_put(pdev); /* XXX for the case, when ebusnd is 0, is it OK? */ #ifdef CONFIG_SUN_AUXIO auxio_probe(); |