2004-10-04 23:54:28

by Hanna Linder

Subject: [PATCH 2.6] [3/12] gemini_pci.c replace pci_find_device with pci_get_device

As pci_find_device is going away I have replaced this call with pci_get_device.
If someone with a PPC system could verify it I would appreciate it.

Hanna Linder
IBM Linux Technology Center

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

----

diff -Nrup linux-2.6.9-rc3-mm2cln/arch/ppc/platforms/gemini_pci.c linux-2.6.9-rc3-mm2patch/arch/ppc/platforms/gemini_pci.c
--- linux-2.6.9-rc3-mm2cln/arch/ppc/platforms/gemini_pci.c 2004-09-29 20:04:25.000000000 -0700
+++ linux-2.6.9-rc3-mm2patch/arch/ppc/platforms/gemini_pci.c 2004-10-04 16:49:59.270903688 -0700
@@ -15,7 +15,7 @@ void __init gemini_pcibios_fixup(void)
int i;
struct pci_dev *dev = NULL;

- while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+ while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
for(i = 0; i < 6; i++) {
if (dev->resource[i].flags & IORESOURCE_IO) {
dev->resource[i].start |= (0xfe << 24);

2004-10-06 23:36:05

by Hanna Linder

Subject: Re: [PATCH 2.6] [3/12] gemini_pci.c replace pci_find_device with pci_get_device

--On Monday, October 04, 2004 04:55:14 PM -0700 Hanna Linder <[email protected]> wrote:

> As pci_find_device is going away I have replaced this call with pci_get_device.
> If someone with a PPC system could verify it I would appreciate it.
>
> Hanna Linder
> IBM Linux Technology Center
>
> Signed-off-by: Hanna Linder <[email protected]>

Reroll this patch to use new macro

diff -Nrup linux-2.6.9-rc3-mm2cln/arch/ppc/platforms/gemini_pci.c linux-2.6.9-rc3-mm2patch2/arch/ppc/platforms/gemini_pci.c
--- linux-2.6.9-rc3-mm2cln/arch/ppc/platforms/gemini_pci.c 2004-09-29 20:04:25.000000000 -0700
+++ linux-2.6.9-rc3-mm2patch2/arch/ppc/platforms/gemini_pci.c 2004-10-06 16:22:53.979890256 -0700
@@ -15,7 +15,7 @@ void __init gemini_pcibios_fixup(void)
int i;
struct pci_dev *dev = NULL;

- while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+ for_each_pci_dev(dev) {
for(i = 0; i < 6; i++) {
if (dev->resource[i].flags & IORESOURCE_IO) {
dev->resource[i].start |= (0xfe << 24);