[POWERPC] 52xx: Remove support for PCI bus_offset

The hose->bus_offset is only used for PCI config cycles and the 52xx PCI
config code doesn't actually ever set bus_offset to a non-zero value.

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

diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
index 51164c851cacd158cd5e7e67b587d6f790a2eb48..57ca2feb0799492458292e5e0c9660e40198627c 100644 (file)
--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
@@ -117,13 +117,13 @@ mpc52xx_pci_read_config(struct pci_bus *bus, unsigned int devfn,
 
        out_be32(hose->cfg_addr,
                (1 << 31) |
-               ((bus->number - hose->bus_offset) << 16) |
+               (bus->number << 16) |
                (devfn << 8) |
                (offset & 0xfc));
        mb();
 
 #if defined(CONFIG_PPC_MPC5200_BUGFIX)
-       if (bus->number != hose->bus_offset) {
+       if (bus->number) {
                /* workaround for the bug 435 of the MPC5200 (L25R);
                 * Don't do 32 bits config access during type-1 cycles */
                switch (len) {
@@ -174,13 +174,13 @@ mpc52xx_pci_write_config(struct pci_bus *bus, unsigned int devfn,
 
        out_be32(hose->cfg_addr,
                (1 << 31) |
-               ((bus->number - hose->bus_offset) << 16) |
+               (bus->number << 16) |
                (devfn << 8) |
                (offset & 0xfc));
        mb();
 
 #if defined(CONFIG_PPC_MPC5200_BUGFIX)
-       if (bus->number != hose->bus_offset) {
+       if (bus->number) {
                /* workaround for the bug 435 of the MPC5200 (L25R);
                 * Don't do 32 bits config access during type-1 cycles */
                switch (len) {
@@ -394,7 +394,6 @@ mpc52xx_add_bridge(struct device_node *node)
        hose->first_busno = bus_range ? bus_range[0] : 0;
        hose->last_busno = bus_range ? bus_range[1] : 0xff;
 
-       hose->bus_offset = 0;
        hose->ops = &mpc52xx_pci_ops;
 
        pci_regs = ioremap(rsrc.start, rsrc.end - rsrc.start + 1);