Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a5ccbc5 authored by Kumar Gala's avatar Kumar Gala
Browse files

[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: default avatarKumar Gala <galak@kernel.crashing.org>
parent 5229ee18

arch/powerpc/platforms/82xx/mpc82xx_ads.c

+0 −1
Original line number Diff line number Diff line
@@ -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),

arch/powerpc/sysdev/fsl_pcie.c

+4 −4
Original line number Diff line number Diff line
@@ -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) )));

        }