aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-03-14 05:36:12 -0400
committerRalf Baechle <ralf@linux-mips.org>2012-05-15 11:49:06 -0400
commit52c28be371e33b99700811dbed009913b854c44d (patch)
treeef530385cc70170d37d8278f7ad7f7385dffafe7 /arch
parentd22ce25f870dff2521d352e20d0fd2a7598fbf87 (diff)
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')
-rw-r--r--arch/mips/ath79/mach-ubnt-xm.c7
-rw-r--r--arch/mips/ath79/pci.c8
-rw-r--r--arch/mips/ath79/pci.h6
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 = {
82#ifdef CONFIG_PCI 82#ifdef CONFIG_PCI
83static struct ath9k_platform_data ubnt_xm_eeprom_data; 83static struct ath9k_platform_data ubnt_xm_eeprom_data;
84 84
85static struct ar724x_pci_data ubnt_xm_pci_data[] = {
86 {
87 .irq = ATH79_PCI_IRQ(0),
88 },
89};
90
91static int ubnt_xm_pci_plat_dev_init(struct pci_dev *dev) 85static int ubnt_xm_pci_plat_dev_init(struct pci_dev *dev)
92{ 86{
93 switch (PCI_SLOT(dev->devfn)) { 87 switch (PCI_SLOT(dev->devfn)) {
@@ -104,7 +98,6 @@ static void __init ubnt_xm_pci_init(void)
104 memcpy(ubnt_xm_eeprom_data.eeprom_data, UBNT_XM_EEPROM_ADDR, 98 memcpy(ubnt_xm_eeprom_data.eeprom_data, UBNT_XM_EEPROM_ADDR,
105 sizeof(ubnt_xm_eeprom_data.eeprom_data)); 99 sizeof(ubnt_xm_eeprom_data.eeprom_data));
106 100
107 ar724x_pci_add_data(ubnt_xm_pci_data, ARRAY_SIZE(ubnt_xm_pci_data));
108 ath79_pci_set_plat_dev_init(ubnt_xm_pci_plat_dev_init); 101 ath79_pci_set_plat_dev_init(ubnt_xm_pci_plat_dev_init);
109 ath79_register_pci(); 102 ath79_register_pci();
110} 103}
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 @@
18static int (*ath79_pci_plat_dev_init)(struct pci_dev *dev); 18static int (*ath79_pci_plat_dev_init)(struct pci_dev *dev);
19static const struct ath79_pci_irq *ath79_pci_irq_map __initdata; 19static const struct ath79_pci_irq *ath79_pci_irq_map __initdata;
20static unsigned ath79_pci_nr_irqs __initdata; 20static unsigned ath79_pci_nr_irqs __initdata;
21static struct ar724x_pci_data *pci_data;
22static int pci_data_size;
23 21
24static const struct ath79_pci_irq ar71xx_pci_irq_map[] __initconst = { 22static const struct ath79_pci_irq ar71xx_pci_irq_map[] __initconst = {
25 { 23 {
@@ -45,12 +43,6 @@ static const struct ath79_pci_irq ar724x_pci_irq_map[] __initconst = {
45 } 43 }
46}; 44};
47 45
48void ar724x_pci_add_data(struct ar724x_pci_data *data, int size)
49{
50 pci_data = data;
51 pci_data_size = size;
52}
53
54int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin) 46int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin)
55{ 47{
56 int irq = -1; 48 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 @@
11#ifndef _ATH79_PCI_H 11#ifndef _ATH79_PCI_H
12#define _ATH79_PCI_H 12#define _ATH79_PCI_H
13 13
14struct ar724x_pci_data {
15 int irq;
16};
17
18struct ath79_pci_irq { 14struct ath79_pci_irq {
19 u8 slot; 15 u8 slot;
20 u8 pin; 16 u8 pin;
21 int irq; 17 int irq;
22}; 18};
23 19
24void ar724x_pci_add_data(struct ar724x_pci_data *data, int size);
25
26#ifdef CONFIG_PCI 20#ifdef CONFIG_PCI
27void ath79_pci_set_irq_map(unsigned nr_irqs, const struct ath79_pci_irq *map); 21void ath79_pci_set_irq_map(unsigned nr_irqs, const struct ath79_pci_irq *map);
28void ath79_pci_set_plat_dev_init(int (*func)(struct pci_dev *dev)); 22void ath79_pci_set_plat_dev_init(int (*func)(struct pci_dev *dev));