patch-2.3.37 linux/drivers/block/ide-pci.c

Next file: linux/drivers/block/loop.c
Previous file: linux/drivers/block/floppy.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.36/linux/drivers/block/ide-pci.c linux/drivers/block/ide-pci.c
@@ -635,7 +635,7 @@
 	if (PCI_FUNC(dev->devfn) & 1)
 		return;
 	pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin1);
-	for (findev=pci_devices; findev; findev=findev->next) {
+	pci_for_each_dev(findev) {
 		if ((findev->vendor == dev->vendor) &&
 		    (findev->device == dev->device) &&
 		    ((findev->devfn - dev->devfn) == 1) &&
@@ -669,9 +669,7 @@
 	ide_pci_devid_t		devid;
 	ide_pci_device_t	*d;
 
-	if (!pci_present())
-		return;
-	for(dev = pci_devices; dev; dev=dev->next) {
+	pci_for_each_dev(dev) {
 		devid.vid = dev->vendor;
 		devid.did = dev->device;
 		for (d = ide_pci_chipsets; d->devid.vid && !IDE_PCI_DEVID_EQ(d->devid, devid); ++d);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)