powerpc/pci: cleanup some minor cruft
PATCH 1/1 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 Kumar Gala <[email protected]>
--- arch/powerpc/include/asm/pci-bridge.h | 6 ------ arch/powerpc/kernel/pci_32.c | 8 -------- drivers/pci/Makefile | 1 - 3 files changed, 0 insertions(+), 15 deletions(-)
arch/powerpc/include/asm/pci-bridge.h +0 -6
@@ -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
@@ -185,7 +180,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
@@ -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
@@ -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
Signature · 1 line
1.6.0.6
PATCH 1/1 powerpc/pci: Remove redundant pcnet32 fixup
The pcnet32 driver has had in its device id table for some time a match against the "broken" vendor ID. No need to fake out the vendor ID with an explicit fixup.
Signed-off-by Kumar Gala <[email protected]>
--- arch/powerpc/kernel/pci_32.c | 11 ----------- arch/powerpc/kernel/pci_64.c | 10 ---------- 2 files changed, 0 insertions(+), 21 deletions(-)
arch/powerpc/kernel/pci_32.c +0 -11
@@ -33,7 +33,6 @@ int pcibios_assign_bus_offset = 1;void pcibios_make_OF_bus_map (void ); -static void fixup_broken_pcnet32 (struct pci_dev * dev);static void fixup_cpc710_pci64 (struct pci_dev * dev);#ifdef CONFIG_PPC_OF static u8 * pci_to_OF_bus_map;
@@ -72,16 +71,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MOTOROLA, PCI_ANY_ID, fixup_hide_host_resDECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_FREESCALE ,PCI_ANY_ID , fixup_hide_host_resource_fsl);static void -fixup_broken_pcnet32 (struct pci_dev * dev) -{ -if ((dev->class>>8 ==PCI_CLASS_NETWORK_ETHERNET )) { - dev->vendor =PCI_VENDOR_ID_AMD ; -pci_write_config_word (dev,PCI_VENDOR_ID ,PCI_VENDOR_ID_AMD ); - } -} -DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_TRIDENT ,PCI_ANY_ID , fixup_broken_pcnet32); - -static void fixup_cpc710_pci64 (struct pci_dev * dev) {/* Hide the PCI64 BARs from the kernel as their content doesn't
arch/powerpc/kernel/pci_64.c +0 -10
@@ -43,16 +43,6 @@ unsigned long pci_probe_only = 1;unsigned long pci_io_base =ISA_IO_BASE ;EXPORT_SYMBOL (pci_io_base); -static void fixup_broken_pcnet32 (struct pci_dev * dev) -{ -if ((dev->class>>8 ==PCI_CLASS_NETWORK_ETHERNET )) { - dev->vendor =PCI_VENDOR_ID_AMD ; -pci_write_config_word (dev,PCI_VENDOR_ID ,PCI_VENDOR_ID_AMD ); - } -} -DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_TRIDENT ,PCI_ANY_ID , fixup_broken_pcnet32); - -static u32 get_int_prop (struct device_node *np,const char *name,u32 def) {const u32 *prop;
Signature · 1 line
1.6.0.6