2004-10-08 17:56:45

by Hanna Linder

Subject: [PATCH 2.6] pSeries_pci.c replace pci_find_device with pci_get_device

As pci_find_device is going away I've replaced it with pci_get_device.
If someone with a PPC64 system could test it I would appreciate it.

Thanks.

Hanna Linder
IBM Linux Technology Center

Signed-off-by: Hanna Linder <[email protected]>

---
diff -Nrup linux-2.6.9-rc3-mm3cln/arch/ppc64/kernel/pSeries_pci.c linux-2.6.9-rc3-mm3patch3/arch/ppc64/kernel/pSeries_pci.c
--- linux-2.6.9-rc3-mm3cln/arch/ppc64/kernel/pSeries_pci.c 2004-10-07 15:54:30.000000000 -0700
+++ linux-2.6.9-rc3-mm3patch3/arch/ppc64/kernel/pSeries_pci.c 2004-10-08 10:24:00.064501400 -0700
@@ -646,7 +646,7 @@ void __init pSeries_final_fixup(void)

check_s7a();

- while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+ for_each_pci_dev(dev) {
pci_read_irq_line(dev);
if (s7a_workaround) {
if (dev->irq > 16) {

2004-10-08 18:16:28

by Hanna Linder

Subject: [PATCH 2.6] iSeries_pci.c replace pci_find_device with pci_get_device

As pci_find_device is going away I've replaced it with pci_get_device and pci_dev_put.
If someone with a PPC64 system could test it I would appreciate it.

Thanks.

Hanna Linder
IBM Linux Technology Center

Signed-off-by: Hanna Linder <[email protected]>

---




diff -Nrup linux-2.6.9-rc3-mm3cln/arch/ppc64/kernel/iSeries_pci.c linux-2.6.9-rc3-mm3patch/arch/ppc64/kernel/iSeries_pci.c
--- linux-2.6.9-rc3-mm3cln/arch/ppc64/kernel/iSeries_pci.c 2004-09-29 20:05:52.000000000 -0700
+++ linux-2.6.9-rc3-mm3patch/arch/ppc64/kernel/iSeries_pci.c 2004-10-08 10:20:56.576395832 -0700
@@ -216,8 +216,7 @@ void __init iSeries_pci_final_fixup(void
mf_displaySrc(0xC9000100);

printk("pcibios_final_fixup\n");
- while ((pdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pdev))
- != NULL) {
+ for_each_pci_dev(pdev) {
node = find_Device_Node(pdev->bus->number, pdev->devfn);
printk("pci dev %p (%x.%x), node %p\n", pdev,
pdev->bus->number, pdev->devfn, node);

2004-10-08 20:14:56

by Hanna Linder

Subject: [PATCH 2.6] pmac_pci.c replace pci_find_device with pci_get_device

As pci_find_device is going away I've replaced it with pci_get_device and pci_dev_put.
If someone with a PPC64 system could test it I would appreciate it.

Thanks.

Hanna Linder
IBM Linux Technology Center

Signed-off-by: Hanna Linder <[email protected]>

---
diff -Nrup linux-2.6.9-rc3-mm3cln/arch/ppc64/kernel/pmac_pci.c linux-2.6.9-rc3-mm3patch/arch/ppc64/kernel/pmac_pci.c
--- linux-2.6.9-rc3-mm3cln/arch/ppc64/kernel/pmac_pci.c 2004-10-07 15:54:29.000000000 -0700
+++ linux-2.6.9-rc3-mm3patch/arch/ppc64/kernel/pmac_pci.c 2004-10-08 10:42:47.000000000 -0700
@@ -669,7 +669,7 @@ void __init pmac_pcibios_fixup(void)
{
struct pci_dev *dev = NULL;

- while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL)
+ for_each_pci_dev(dev)
pci_read_irq_line(dev);

pci_fix_bus_sysdata();

2004-10-08 20:18:22

by Hanna Linder

Subject: [PATCH 2.6] u3_iommu.c replace pci_find_device with pci_get_device

As pci_find_device is going away I've replaced it with pci_get_device and pci_dev_put.
If someone with a PPC64 system could test it I would appreciate it.

Thanks.

Hanna Linder
IBM Linux Technology Center

Signed-off-by: Hanna Linder <[email protected]>

---
diff -Nrup linux-2.6.9-rc3-mm3cln/arch/ppc64/kernel/u3_iommu.c linux-2.6.9-rc3-mm3patch2/arch/ppc64/kernel/u3_iommu.c
--- linux-2.6.9-rc3-mm3cln/arch/ppc64/kernel/u3_iommu.c 2004-09-29 20:05:52.000000000 -0700
+++ linux-2.6.9-rc3-mm3patch2/arch/ppc64/kernel/u3_iommu.c 2004-10-08 13:10:06.883314632 -0700
@@ -290,7 +290,7 @@ void iommu_setup_u3(void)
/* We only have one iommu table on the mac for now, which makes
* things simple. Setup all PCI devices to point to this table
*/
- while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+ for_each_pci_dev(dev) {
/* We must use pci_device_to_OF_node() to make sure that
* we get the real "final" pointer to the device in the
* pci_dev sysdata and not the temporary PHB one