Merge tag 'sh-for-v6.4-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubit...

[linux.git] / arch / sh / drivers / pci / pcie-sh7786.c

diff --git a/arch/sh/drivers/pci/pcie-sh7786.c b/arch/sh/drivers/pci/pcie-sh7786.c
index b0c2a5238d04974c206cd2eef0642a412c73804c..a78b9a9355855fdc0e33203f3e09c675f99f4d43 100644 (file)
--- a/arch/sh/drivers/pci/pcie-sh7786.c
+++ b/arch/sh/drivers/pci/pcie-sh7786.c
@@ -31,7 +31,6 @@ struct sh7786_pcie_port {
 
 static struct sh7786_pcie_port *sh7786_pcie_ports;
 static unsigned int nr_ports;
-static unsigned long dma_pfn_offset;
 size_t memsize;
 u64 memstart;
 
@@ -140,12 +139,12 @@ static void sh7786_pci_fixup(struct pci_dev *dev)
         * Prevent enumeration of root complex resources.
         */
        if (pci_is_root_bus(dev->bus) && dev->devfn == 0) {
-               int i;
+               struct resource *r;
 
-               for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
-                       dev->resource[i].start  = 0;
-                       dev->resource[i].end    = 0;
-                       dev->resource[i].flags  = 0;
+               pci_dev_for_each_resource(dev, r) {
+                       r->start        = 0;
+                       r->end          = 0;
+                       r->flags        = 0;
                }
        }
 }