On Mon, 2007-07-23 at 15:50 -0500, Kumar Gala wrote:
> 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 <[EMAIL PROTECTED]>
Good riddance !
Acked-by: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
> ---
> arch/powerpc/sysdev/indirect_pci.c | 17 ++++-------------
> include/asm-powerpc/pci-bridge.h | 2 --
> 2 files changed, 4 insertions(+), 15 deletions(-)
>
> diff --git a/arch/powerpc/sysdev/indirect_pci.c
> b/arch/powerpc/sysdev/indirect_pci.c
> index bc5b4e2..ad341f5 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;
> }
> diff --git a/include/asm-powerpc/pci-bridge.h
> b/include/asm-powerpc/pci-bridge.h
> index 9754357..13cb0a9 100644
> --- a/include/asm-powerpc/pci-bridge.h
> +++ b/include/asm-powerpc/pci-bridge.h
> @@ -87,8 +87,6 @@ int early_write_config_dword(struct pci_controller *hose,
> int bus, int dev_fn,
> extern int early_find_capability(struct pci_controller *hose, int bus,
> int dev_fn, int cap);
>
> -extern void setup_indirect_pci_nomap(struct pci_controller* hose,
> - void __iomem *cfg_addr, void __iomem *cfg_data);
> extern void setup_indirect_pci(struct pci_controller* hose,
> u32 cfg_addr, u32 cfg_data);
> extern void setup_grackle(struct pci_controller *hose);
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
