diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-03-14 10:36:12 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-05-15 17:49:06 +0200 |
| commit | 52c28be371e33b99700811dbed009913b854c44d (patch) | |
| tree | ef530385cc70170d37d8278f7ad7f7385dffafe7 /arch/mips/ath79 | |
| parent | MIPS: ath79: allow to use SoC specific PCI IRQ maps (diff) | |
| download | linux-52c28be371e33b99700811dbed009913b854c44d.tar.xz linux-52c28be371e33b99700811dbed009913b854c44d.zip | |
MIPS: ath79: remove ar724x_pci_add_data function
The variables set by this function are not used anymore.
Remove the function and the relevant variables as well.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3501/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/ath79')
| -rw-r--r-- | arch/mips/ath79/mach-ubnt-xm.c | 7 | ||||
| -rw-r--r-- | arch/mips/ath79/pci.c | 8 | ||||
| -rw-r--r-- | arch/mips/ath79/pci.h | 6 |
3 files changed, 0 insertions, 21 deletions
diff --git a/arch/mips/ath79/mach-ubnt-xm.c b/arch/mips/ath79/mach-ubnt-xm.c index ca47ba57a206..4a3c60694c75 100644 --- a/arch/mips/ath79/mach-ubnt-xm.c +++ b/arch/mips/ath79/mach-ubnt-xm.c @@ -82,12 +82,6 @@ static struct ath79_spi_platform_data ubnt_xm_spi_data = { #ifdef CONFIG_PCI static struct ath9k_platform_data ubnt_xm_eeprom_data; -static struct ar724x_pci_data ubnt_xm_pci_data[] = { - { - .irq = ATH79_PCI_IRQ(0), - }, -}; - static int ubnt_xm_pci_plat_dev_init(struct pci_dev *dev) { switch (PCI_SLOT(dev->devfn)) { @@ -104,7 +98,6 @@ static void __init ubnt_xm_pci_init(void) memcpy(ubnt_xm_eeprom_data.eeprom_data, UBNT_XM_EEPROM_ADDR, sizeof(ubnt_xm_eeprom_data.eeprom_data)); - ar724x_pci_add_data(ubnt_xm_pci_data, ARRAY_SIZE(ubnt_xm_pci_data)); ath79_pci_set_plat_dev_init(ubnt_xm_pci_plat_dev_init); ath79_register_pci(); } diff --git a/arch/mips/ath79/pci.c b/arch/mips/ath79/pci.c index 365a8b63e8c5..253a382f63b2 100644 --- a/arch/mips/ath79/pci.c +++ b/arch/mips/ath79/pci.c @@ -18,8 +18,6 @@ static int (*ath79_pci_plat_dev_init)(struct pci_dev *dev); static const struct ath79_pci_irq *ath79_pci_irq_map __initdata; static unsigned ath79_pci_nr_irqs __initdata; -static struct ar724x_pci_data *pci_data; -static int pci_data_size; static const struct ath79_pci_irq ar71xx_pci_irq_map[] __initconst = { { @@ -45,12 +43,6 @@ static const struct ath79_pci_irq ar724x_pci_irq_map[] __initconst = { } }; -void ar724x_pci_add_data(struct ar724x_pci_data *data, int size) -{ - pci_data = data; - pci_data_size = size; -} - int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin) { int irq = -1; diff --git a/arch/mips/ath79/pci.h b/arch/mips/ath79/pci.h index a5c4e5856202..5ebed2104ed0 100644 --- a/arch/mips/ath79/pci.h +++ b/arch/mips/ath79/pci.h @@ -11,18 +11,12 @@ #ifndef _ATH79_PCI_H #define _ATH79_PCI_H -struct ar724x_pci_data { - int irq; -}; - struct ath79_pci_irq { u8 slot; u8 pin; int irq; }; -void ar724x_pci_add_data(struct ar724x_pci_data *data, int size); - #ifdef CONFIG_PCI void ath79_pci_set_irq_map(unsigned nr_irqs, const struct ath79_pci_irq *map); void ath79_pci_set_plat_dev_init(int (*func)(struct pci_dev *dev)); |