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

Commit cf6692c0 authored by Kumar Gala's avatar Kumar Gala Committed by Benjamin Herrenschmidt
Browse files

powerpc/pci: Cleanup some minor cruft 



* Removed building setup-irq on ppc32, we don't use it anymore
* Remove duplicate prototype for setup_grackle() code that needs it
  gets it from <asm/grackle.h>
* Removed gratuitous pci_io_size type differences between ppc32/ppc64

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 2eb4afb6

arch/powerpc/include/asm/pci-bridge.h

+0 −6
Original line number Diff line number Diff line
@@ -86,17 +86,12 @@ struct pci_controller { 
	void *io_base_alloc;

#endif

	resource_size_t io_base_phys;

#ifndef CONFIG_PPC64

	resource_size_t pci_io_size;

#endif



	/* Some machines (PReP) have a non 1:1 mapping of

	 * the PCI memory space in the CPU bus space

	 */

	resource_size_t pci_mem_offset;

#ifdef CONFIG_PPC64

	unsigned long pci_io_size;

#endif



	/* Some machines have a special region to forward the ISA

	 * "memory" cycles such as VGA memory regions. Left to 0
@@ -187,7 +182,6 @@ extern int early_find_capability(struct pci_controller *hose, int bus, 
extern void setup_indirect_pci(struct pci_controller* hose,

			       resource_size_t cfg_addr,

			       resource_size_t cfg_data, u32 flags);

extern void setup_grackle(struct pci_controller *hose);

#else	/* CONFIG_PPC64 */



/*

arch/powerpc/kernel/pci_32.c

+0 −8
Original line number Diff line number Diff line
@@ -447,14 +447,6 @@ static int __init pcibios_init(void) 


subsys_initcall(pcibios_init);



/* the next one is stolen from the alpha port... */

void __init

pcibios_update_irq(struct pci_dev *dev, int irq)

{

	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);

	/* XXX FIXME - update OF device tree node interrupt property */

}



static struct pci_controller*

pci_bus_to_hose(int bus)

{

drivers/pci/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o 
obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o

obj-$(CONFIG_PARISC) += setup-bus.o

obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o

obj-$(CONFIG_PPC32) += setup-irq.o

obj-$(CONFIG_PPC) += setup-bus.o

obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o

obj-$(CONFIG_X86_VISWS) += setup-irq.o