PCI: replace struct pci_bus secondary/subordinate with busn_res

Replace the struct pci_bus secondary/subordinate members with the
struct resource busn_res.  Later we'll build a resource tree of these
bus numbers.

[bhelgaas: changelog]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

3 files changed, 17 insertions, 17 deletions

diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index 432d4bbcc62a..70517b0f94e6 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -174,7 +174,7 @@ static int dino_cfg_read(struct pci_bus *bus, unsigned int devfn, int where,
                 int size, u32 *val)
 {
         struct dino_device *d = DINO_DEV(parisc_walk_tree(bus->bridge));
-        u32 local_bus = (bus->parent == NULL) ? 0 : bus->secondary;
+        u32 local_bus = (bus->parent == NULL) ? 0 : bus->busn_res.start;
         u32 v = DINO_CFG_TOK(local_bus, devfn, where & ~3);
         void __iomem *base_addr = d->hba.base_addr;
         unsigned long flags;
@@ -209,7 +209,7 @@ static int dino_cfg_write(struct pci_bus *bus, unsigned int devfn, int where,
         int size, u32 val)
 {
         struct dino_device *d = DINO_DEV(parisc_walk_tree(bus->bridge));
-        u32 local_bus = (bus->parent == NULL) ? 0 : bus->secondary;
+        u32 local_bus = (bus->parent == NULL) ? 0 : bus->busn_res.start;
         u32 v = DINO_CFG_TOK(local_bus, devfn, where & ~3);
         void __iomem *base_addr = d->hba.base_addr;
         unsigned long flags;
@@ -554,7 +554,7 @@ dino_fixup_bus(struct pci_bus *bus)
         struct dino_device *dino_dev = DINO_DEV(parisc_walk_tree(bus->bridge));
 
         DBG(KERN_WARNING "%s(0x%p) bus %d platform_data 0x%p\n",
-            __func__, bus, bus->secondary,
+            __func__, bus, bus->busn_res.start,
             bus->bridge->platform_data);
 
         /* Firmware doesn't set up card-mode dino, so we have to */
@@ -998,12 +998,12 @@ static int __init dino_probe(struct parisc_device *dev)
                 return 0;
         }
 
-        bus->subordinate = pci_scan_child_bus(bus);
+        bus->busn_res.end = pci_scan_child_bus(bus);
 
         /* This code *depends* on scanning being single threaded
          * if it isn't, this global bus number count will fail
          */
-        dino_current_bus = bus->subordinate + 1;
+        dino_current_bus = bus->busn_res.end + 1;
         pci_bus_assign_resources(bus);
         pci_bus_add_devices(bus);
         return 0;
diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index 1f9e9fefb8e7..83380c8fcb6b 100644
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -532,7 +532,7 @@ iosapic_xlate_pin(struct iosapic_info *isi, struct pci_dev *pcidev)
                 intr_slot = PCI_SLOT(pcidev->devfn);
         }
         DBG_IRT("iosapic_xlate_pin:  bus %d slot %d pin %d\n",
-                                pcidev->bus->secondary, intr_slot, intr_pin);
+                        pcidev->bus->busn_res.start, intr_slot, intr_pin);
 
         return irt_find_irqline(isi, intr_slot, intr_pin);
 }
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index 052fa230bc77..cd8f9ce8720f 100644
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -189,8 +189,8 @@ lba_dump_res(struct resource *r, int d)
 
 static int lba_device_present(u8 bus, u8 dfn, struct lba_device *d)
 {
-        u8 first_bus = d->hba.hba_bus->secondary;
-        u8 last_sub_bus = d->hba.hba_bus->subordinate;
+        u8 first_bus = d->hba.hba_bus->busn_res.start;
+        u8 last_sub_bus = d->hba.hba_bus->busn_res.end;
 
         if ((bus < first_bus) ||
             (bus > last_sub_bus) ||
@@ -364,7 +364,7 @@ lba_rd_cfg(struct lba_device *d, u32 tok, u8 reg, u32 size)
 static int elroy_cfg_read(struct pci_bus *bus, unsigned int devfn, int pos, int size, u32 *data)
 {
         struct lba_device *d = LBA_DEV(parisc_walk_tree(bus->bridge));
-        u32 local_bus = (bus->parent == NULL) ? 0 : bus->secondary;
+        u32 local_bus = (bus->parent == NULL) ? 0 : bus->busn_res.start;
         u32 tok = LBA_CFG_TOK(local_bus, devfn);
         void __iomem *data_reg = d->hba.base_addr + LBA_PCI_CFG_DATA;
 
@@ -380,7 +380,7 @@ static int elroy_cfg_read(struct pci_bus *bus, unsigned int devfn, int pos, int
                 return 0;
         }
 
-        if (LBA_SKIP_PROBE(d) && !lba_device_present(bus->secondary, devfn, d)) {
+        if (LBA_SKIP_PROBE(d) && !lba_device_present(bus->busn_res.start, devfn, d)) {
                 DBG_CFG("%s(%x+%2x) -> -1 (b)\n", __func__, tok, pos);
                 /* either don't want to look or know device isn't present. */
                 *data = ~0U;
@@ -431,7 +431,7 @@ lba_wr_cfg(struct lba_device *d, u32 tok, u8 reg, u32 data, u32 size)
 static int elroy_cfg_write(struct pci_bus *bus, unsigned int devfn, int pos, int size, u32 data)
 {
         struct lba_device *d = LBA_DEV(parisc_walk_tree(bus->bridge));
-        u32 local_bus = (bus->parent == NULL) ? 0 : bus->secondary;
+        u32 local_bus = (bus->parent == NULL) ? 0 : bus->busn_res.start;
         u32 tok = LBA_CFG_TOK(local_bus,devfn);
 
         if ((pos > 255) || (devfn > 255))
@@ -444,7 +444,7 @@ static int elroy_cfg_write(struct pci_bus *bus, unsigned int devfn, int pos, int
                 return 0;
         }
 
-        if (LBA_SKIP_PROBE(d) && (!lba_device_present(bus->secondary, devfn, d))) {
+        if (LBA_SKIP_PROBE(d) && (!lba_device_present(bus->busn_res.start, devfn, d))) {
                 DBG_CFG("%s(%x+%2x) = 0x%x (b)\n", __func__, tok, pos,data);
                 return 1; /* New Workaround */
         }
@@ -481,7 +481,7 @@ static struct pci_ops elroy_cfg_ops = {
 static int mercury_cfg_read(struct pci_bus *bus, unsigned int devfn, int pos, int size, u32 *data)
 {
         struct lba_device *d = LBA_DEV(parisc_walk_tree(bus->bridge));
-        u32 local_bus = (bus->parent == NULL) ? 0 : bus->secondary;
+        u32 local_bus = (bus->parent == NULL) ? 0 : bus->busn_res.start;
         u32 tok = LBA_CFG_TOK(local_bus, devfn);
         void __iomem *data_reg = d->hba.base_addr + LBA_PCI_CFG_DATA;
 
@@ -514,7 +514,7 @@ static int mercury_cfg_write(struct pci_bus *bus, unsigned int devfn, int pos, i
 {
         struct lba_device *d = LBA_DEV(parisc_walk_tree(bus->bridge));
         void __iomem *data_reg = d->hba.base_addr + LBA_PCI_CFG_DATA;
-        u32 local_bus = (bus->parent == NULL) ? 0 : bus->secondary;
+        u32 local_bus = (bus->parent == NULL) ? 0 : bus->busn_res.start;
         u32 tok = LBA_CFG_TOK(local_bus,devfn);
 
         if ((pos > 255) || (devfn > 255))
@@ -636,7 +636,7 @@ lba_fixup_bus(struct pci_bus *bus)
         struct lba_device *ldev = LBA_DEV(parisc_walk_tree(bus->bridge));
 
         DBG("lba_fixup_bus(0x%p) bus %d platform_data 0x%p\n",
-                bus, bus->secondary, bus->bridge->platform_data);
+                bus, (int)bus->busn_res.start, bus->bridge->platform_data);
 
         /*
         ** Properly Setup MMIO resources for this bus.
@@ -1511,7 +1511,7 @@ lba_driver_probe(struct parisc_device *dev)
                 return 0;
         }
 
-        lba_bus->subordinate = pci_scan_child_bus(lba_bus);
+        lba_bus->busn_res.end = pci_scan_child_bus(lba_bus);
 
         /* This is in lieu of calling pci_assign_unassigned_resources() */
         if (is_pdc_pat()) {
@@ -1541,7 +1541,7 @@ lba_driver_probe(struct parisc_device *dev)
                 lba_dev->flags |= LBA_FLAG_SKIP_PROBE;
         }
 
-        lba_next_bus = lba_bus->subordinate + 1;
+        lba_next_bus = lba_res->busn_res.end + 1;
         pci_bus_add_devices(lba_bus);
 
         /* Whew! Finally done! Tell services we got this one covered. */