From 089b5ccb47ecfe9f7e1a4c613e6b0fc0885b6cd9 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sun, 5 Jul 2009 07:53:07 +0000 Subject: reorganize PCI code SVN-Revision: 16672 --- .../linux/ar71xx/files/arch/mips/pci/pci-ar71xx.c | 34 +++++----------------- 1 file changed, 7 insertions(+), 27 deletions(-) (limited to 'target/linux/ar71xx/files/arch/mips/pci') diff --git a/target/linux/ar71xx/files/arch/mips/pci/pci-ar71xx.c b/target/linux/ar71xx/files/arch/mips/pci/pci-ar71xx.c index 383a708b8c..711a109697 100644 --- a/target/linux/ar71xx/files/arch/mips/pci/pci-ar71xx.c +++ b/target/linux/ar71xx/files/arch/mips/pci/pci-ar71xx.c @@ -1,7 +1,7 @@ /* * Atheros AR71xx PCI host controller driver * - * Copyright (C) 2008 Gabor Juhos + * Copyright (C) 2008-2009 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * * Parts of this file are based on Atheros' 2.6.15 BSP @@ -36,10 +36,7 @@ #define PCI_IDSEL_BASE 0 #endif -static unsigned ar71xx_pci_nr_irqs; -static struct ar71xx_pci_irq *ar71xx_pci_irq_map __initdata; static void __iomem *ar71xx_pcicfg_base; - static DEFINE_SPINLOCK(ar71xx_pci_lock); static inline void ar71xx_pci_delay(void) @@ -93,7 +90,7 @@ static inline u32 ar71xx_pci_bus_addr(struct pci_bus *bus, unsigned int devfn, return ret; } -static int __ar71xx_pci_be_handler(int is_fixup) +int ar71xx_pci_be_handler(int is_fixup) { u32 pci_err; u32 ahb_err; @@ -135,7 +132,7 @@ static inline int ar71xx_pci_set_cfgaddr(struct pci_bus *bus, ar71xx_pcicfg_wr(PCI_REG_CFG_CBE, cmd | ar71xx_pci_get_ble(where, size, 0)); - return __ar71xx_pci_be_handler(1); + return ar71xx_pci_be_handler(1); } static int ar71xx_pci_read_config(struct pci_bus *bus, unsigned int devfn, @@ -243,10 +240,10 @@ static void ar71xx_pci_fixup(struct pci_dev *dev) pci_write_config_word(dev, PCI_COMMAND, t); } - DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, ar71xx_pci_fixup); -int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin) +int __init ar71xx_pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, + uint8_t pin) { int irq = -1; int i; @@ -274,11 +271,6 @@ int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin) return irq; } -int pcibios_plat_dev_init(struct pci_dev *dev) -{ - return 0; -} - static struct pci_ops ar71xx_pci_ops = { .read = ar71xx_pci_read_config, .write = ar71xx_pci_write_config, @@ -304,8 +296,7 @@ static struct pci_controller ar71xx_pci_controller = { .io_resource = &ar71xx_pci_io_resource, }; -static int __init __ar71xx_pci_bios_init(unsigned nr_irqs, - struct ar71xx_pci_irq *map) +int __init ar71xx_pcibios_init(void) { ar71xx_device_stop(RESET_MODULE_PCI_BUS | RESET_MODULE_PCI_CORE); ar71xx_pci_delay(); @@ -328,20 +319,9 @@ static int __init __ar71xx_pci_bios_init(unsigned nr_irqs, ar71xx_pci_delay(); /* clear bus errors */ - (void)__ar71xx_pci_be_handler(1); - - ar71xx_pci_nr_irqs = nr_irqs; - ar71xx_pci_irq_map = map; - ar71xx_pci_be_handler = __ar71xx_pci_be_handler; + (void)ar71xx_pci_be_handler(1); register_pci_controller(&ar71xx_pci_controller); return 0; } - -static int __init __ar71xx_pci_init(void) -{ - ar71xx_pci_bios_init = __ar71xx_pci_bios_init; - return 0; -} -pure_initcall(__ar71xx_pci_init); -- cgit v1.2.3