diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-07-19 16:44:52 -0400 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-07-23 11:27:08 -0400 |
| commit | d5269966e57484548bc5d38e117f161bf2f56ce9 (patch) | |
| tree | 1f287dc603c58148ad14eea4182a29be97ad80f1 /arch/powerpc/sysdev | |
| parent | 4e7982115e8e426ee885f48c8aedd5e533e23c5b (diff) | |
[POWERPC] Removed setup_indirect_pci_nomap
We don't use setup_indirect_pci_nomap in arch/powerpc and it appears
the users that needed it from arch/ppc are now using setup_indirect_pci.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/indirect_pci.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c index bc5b4e22fa5d..ad341f5ff94f 100644 --- a/arch/powerpc/sysdev/indirect_pci.c +++ b/arch/powerpc/sysdev/indirect_pci.c | |||
| @@ -149,24 +149,15 @@ static struct pci_ops indirect_pci_ops = | |||
| 149 | }; | 149 | }; |
| 150 | 150 | ||
| 151 | void __init | 151 | void __init |
| 152 | setup_indirect_pci_nomap(struct pci_controller* hose, void __iomem * cfg_addr, | ||
| 153 | void __iomem * cfg_data) | ||
| 154 | { | ||
| 155 | hose->cfg_addr = cfg_addr; | ||
| 156 | hose->cfg_data = cfg_data; | ||
| 157 | hose->ops = &indirect_pci_ops; | ||
| 158 | } | ||
| 159 | |||
| 160 | void __init | ||
| 161 | setup_indirect_pci(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data) | 152 | setup_indirect_pci(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data) |
| 162 | { | 153 | { |
| 163 | unsigned long base = cfg_addr & PAGE_MASK; | 154 | unsigned long base = cfg_addr & PAGE_MASK; |
| 164 | void __iomem *mbase, *addr, *data; | 155 | void __iomem *mbase; |
| 165 | 156 | ||
| 166 | mbase = ioremap(base, PAGE_SIZE); | 157 | mbase = ioremap(base, PAGE_SIZE); |
| 167 | addr = mbase + (cfg_addr & ~PAGE_MASK); | 158 | hose->cfg_addr = mbase + (cfg_addr & ~PAGE_MASK); |
| 168 | if ((cfg_data & PAGE_MASK) != base) | 159 | if ((cfg_data & PAGE_MASK) != base) |
| 169 | mbase = ioremap(cfg_data & PAGE_MASK, PAGE_SIZE); | 160 | mbase = ioremap(cfg_data & PAGE_MASK, PAGE_SIZE); |
| 170 | data = mbase + (cfg_data & ~PAGE_MASK); | 161 | hose->cfg_data = mbase + (cfg_data & ~PAGE_MASK); |
| 171 | setup_indirect_pci_nomap(hose, addr, data); | 162 | hose->ops = &indirect_pci_ops; |
| 172 | } | 163 | } |
