diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-07-19 15:44:52 -0500 | 
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-07-23 10:27:08 -0500 | 
| commit | d5269966e57484548bc5d38e117f161bf2f56ce9 (patch) | |
| tree | 1f287dc603c58148ad14eea4182a29be97ad80f1 /arch/powerpc/sysdev/indirect_pci.c | |
| parent | 4e7982115e8e426ee885f48c8aedd5e533e23c5b (diff) | |
| download | olio-linux-3.10-d5269966e57484548bc5d38e117f161bf2f56ce9.tar.xz olio-linux-3.10-d5269966e57484548bc5d38e117f161bf2f56ce9.zip  | |
[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/indirect_pci.c')
| -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 bc5b4e22fa5..ad341f5ff94 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 =  };  void __init -setup_indirect_pci_nomap(struct pci_controller* hose, void __iomem * cfg_addr, -	void __iomem * cfg_data) -{ -	hose->cfg_addr = cfg_addr; -	hose->cfg_data = cfg_data; -	hose->ops = &indirect_pci_ops; -} - -void __init  setup_indirect_pci(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data)  {  	unsigned long base = cfg_addr & PAGE_MASK; -	void __iomem *mbase, *addr, *data; +	void __iomem *mbase;  	mbase = ioremap(base, PAGE_SIZE); -	addr = mbase + (cfg_addr & ~PAGE_MASK); +	hose->cfg_addr = mbase + (cfg_addr & ~PAGE_MASK);  	if ((cfg_data & PAGE_MASK) != base)  		mbase = ioremap(cfg_data & PAGE_MASK, PAGE_SIZE); -	data = mbase + (cfg_data & ~PAGE_MASK); -	setup_indirect_pci_nomap(hose, addr, data); +	hose->cfg_data = mbase + (cfg_data & ~PAGE_MASK); +	hose->ops = &indirect_pci_ops;  }  |