[POWERPC] Remove bus_offset in places its not really used

The user of the fsl_pcie code doesn't set bus_offset and 82xx doesn't
require it either.  Remove the places in the code that reference it so
we can remove it all together.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/platforms/82xx/mpc82xx_ads.c b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
index 715107b6d784f710115f34b611e130619c26b8a0..d1e0919a3dee93c60eb7e23987eaa4e0ba4a842f 100644 (file)
--- a/arch/powerpc/platforms/82xx/mpc82xx_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
@@ -552,7 +552,6 @@ static void __init mpc82xx_add_bridge(struct device_node *np)
 
        hose->first_busno = bus_range ? bus_range[0] : 0;
        hose->last_busno = bus_range ? bus_range[1] : 0xff;
-       hose->bus_offset = 0;
 
        setup_indirect_pci(hose,
                           r.start + offsetof(pci_cpm2_t, pci_cfg_addr),

diff --git a/arch/powerpc/sysdev/fsl_pcie.c b/arch/powerpc/sysdev/fsl_pcie.c
index 6bbd7f84b4e2df2309747f4667a79dbf0f721c95..ea3ec6bfd5774fd97bb5ee673412545c47f16087 100644 (file)
--- a/arch/powerpc/sysdev/fsl_pcie.c
+++ b/arch/powerpc/sysdev/fsl_pcie.c
@@ -50,12 +50,12 @@ indirect_read_config_pcie(struct pci_bus *bus, unsigned int devfn, int offset,
        if (bus->number == 0xff) {
                PCI_CFG_OUT(hose->cfg_addr,
                            (0x80000000 | ((offset & 0xf00) << 16) |
-                            ((bus->number - hose->bus_offset) << 16)
+                            (bus->number<< 16)
                             | (devfn << 8) | ((offset & 0xfc) )));
        } else {
                PCI_CFG_OUT(hose->cfg_addr,
                            (0x80000001 | ((offset & 0xf00) << 16) |
-                            ((bus->number - hose->bus_offset) << 16)
+                            (bus->number<< 16)
                             | (devfn << 8) | ((offset & 0xfc) )));
        }
 
@@ -101,12 +101,12 @@ indirect_write_config_pcie(struct pci_bus *bus, unsigned int devfn, int offset,
        if (bus->number == 0xff) {
                PCI_CFG_OUT(hose->cfg_addr,
                            (0x80000000 | ((offset & 0xf00) << 16) |
-                            ((bus->number - hose->bus_offset) << 16)
+                            (bus->number << 16)
                             | (devfn << 8) | ((offset & 0xfc) )));
        } else {
                PCI_CFG_OUT(hose->cfg_addr,
                            (0x80000001 | ((offset & 0xf00) << 16) |
-                            ((bus->number - hose->bus_offset) << 16)
+                            (bus->number << 16)
                             | (devfn << 8) | ((offset & 0xfc) )));
         }