aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-06-25 13:53:51 -0400
committerKumar Gala <galak@kernel.crashing.org>2007-06-29 02:58:12 -0400
commit2a5ccbc5bb471c10b58ea85ac463e70faead1c8a (patch)
tree1ffbbd25584c636958431cbe5757974d07a79b58
parent5229ee185287f4fd0d7809e6554b40ec83a4ba6c (diff)
[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>
-rw-r--r--arch/powerpc/platforms/82xx/mpc82xx_ads.c1
-rw-r--r--arch/powerpc/sysdev/fsl_pcie.c8
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/82xx/mpc82xx_ads.c b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
index 715107b6d784..d1e0919a3dee 100644
--- 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)
552 552
553 hose->first_busno = bus_range ? bus_range[0] : 0; 553 hose->first_busno = bus_range ? bus_range[0] : 0;
554 hose->last_busno = bus_range ? bus_range[1] : 0xff; 554 hose->last_busno = bus_range ? bus_range[1] : 0xff;
555 hose->bus_offset = 0;
556 555
557 setup_indirect_pci(hose, 556 setup_indirect_pci(hose,
558 r.start + offsetof(pci_cpm2_t, pci_cfg_addr), 557 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 6bbd7f84b4e2..ea3ec6bfd577 100644
--- 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,
50 if (bus->number == 0xff) { 50 if (bus->number == 0xff) {
51 PCI_CFG_OUT(hose->cfg_addr, 51 PCI_CFG_OUT(hose->cfg_addr,
52 (0x80000000 | ((offset & 0xf00) << 16) | 52 (0x80000000 | ((offset & 0xf00) << 16) |
53 ((bus->number - hose->bus_offset) << 16) 53 (bus->number<< 16)
54 | (devfn << 8) | ((offset & 0xfc) ))); 54 | (devfn << 8) | ((offset & 0xfc) )));
55 } else { 55 } else {
56 PCI_CFG_OUT(hose->cfg_addr, 56 PCI_CFG_OUT(hose->cfg_addr,
57 (0x80000001 | ((offset & 0xf00) << 16) | 57 (0x80000001 | ((offset & 0xf00) << 16) |
58 ((bus->number - hose->bus_offset) << 16) 58 (bus->number<< 16)
59 | (devfn << 8) | ((offset & 0xfc) ))); 59 | (devfn << 8) | ((offset & 0xfc) )));
60 } 60 }
61 61
@@ -101,12 +101,12 @@ indirect_write_config_pcie(struct pci_bus *bus, unsigned int devfn, int offset,
101 if (bus->number == 0xff) { 101 if (bus->number == 0xff) {
102 PCI_CFG_OUT(hose->cfg_addr, 102 PCI_CFG_OUT(hose->cfg_addr,
103 (0x80000000 | ((offset & 0xf00) << 16) | 103 (0x80000000 | ((offset & 0xf00) << 16) |
104 ((bus->number - hose->bus_offset) << 16) 104 (bus->number << 16)
105 | (devfn << 8) | ((offset & 0xfc) ))); 105 | (devfn << 8) | ((offset & 0xfc) )));
106 } else { 106 } else {
107 PCI_CFG_OUT(hose->cfg_addr, 107 PCI_CFG_OUT(hose->cfg_addr,
108 (0x80000001 | ((offset & 0xf00) << 16) | 108 (0x80000001 | ((offset & 0xf00) << 16) |
109 ((bus->number - hose->bus_offset) << 16) 109 (bus->number << 16)
110 | (devfn << 8) | ((offset & 0xfc) ))); 110 | (devfn << 8) | ((offset & 0xfc) )));
111 } 111 }
112 112