public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PATCH] PCI: pci_find_device remove (sparc64/kernel/ebus.c)

Browse source 
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>
This commit is contained in:
Jiri Slaby 2005-11-06 23:39:35 -08:00 • committed by Greg Kroah-Hartman
parent 619daa2e4c
commit d08fa1a22e
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
arch/sparc64/kernel/ebus.c
View file

@ -527,18 +527,12 @@ static struct pci_dev *find_next_ebus(struct pci_dev *start, int *is_rio_p)
{ {
struct pci_dev *pdev = start; struct pci_dev *pdev = start;
do { while ((pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_ANY_ID, pdev)))
pdev = pci_find_device(PCI_VENDOR_ID_SUN, PCI_ANY_ID, pdev); if (pdev->device == PCI_DEVICE_ID_SUN_EBUS ||
if (pdev && pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS)
(pdev->device == PCI_DEVICE_ID_SUN_EBUS ||
pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS))
break; break;
} while (pdev != NULL);
if (pdev && (pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS)) *is_rio_p = !!(pdev && (pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS));
*is_rio_p = 1;
else
*is_rio_p = 0;
return pdev; return pdev;
} }
@ -637,6 +631,7 @@ void __init ebus_init(void)
ebus->is_rio = is_rio; ebus->is_rio = is_rio;
++num_ebus; ++num_ebus;
} }
pci_dev_put(pdev); /* XXX for the case, when ebusnd is 0, is it OK? */
#ifdef CONFIG_SUN_AUXIO #ifdef CONFIG_SUN_AUXIO
auxio_probe(); auxio_probe();