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

Commit d5269966 authored by Kumar Gala's avatar Kumar Gala
Browse files

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

arch/powerpc/sysdev/indirect_pci.c

+4 −13
Original line number Diff line number Diff line
@@ -148,25 +148,16 @@ static struct pci_ops indirect_pci_ops = 
	indirect_write_config

};



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;

}

include/asm-powerpc/pci-bridge.h

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