mirror of https://github.com/hak5/openwrt.git
86 lines
2.4 KiB
Diff
86 lines
2.4 KiB
Diff
|
From 0b026adc7a471edd018a060427e62d06e54be2bc Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gabor Juhos <juhosg@openwrt.org>
|
||
|
|
Date: Sun, 20 Nov 2011 15:50:32 +0100
|
||
|
|
Subject: [PATCH 18/35] 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>
|
||
|
|
|
||
|
|
v2: - no changes
|
||
|
|
---
|
||
|
|
arch/mips/ath79/mach-ubnt-xm.c | 7 -------
|
||
|
|
arch/mips/ath79/pci.c | 8 --------
|
||
|
|
arch/mips/ath79/pci.h | 6 ------
|
||
|
|
3 files changed, 0 insertions(+), 21 deletions(-)
|
||
|
|
|
||
|
|
--- 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 ub
|
||
|
|
#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();
|
||
|
|
}
|
||
|
|
--- 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
|
||
|
|
}
|
||
|
|
};
|
||
|
|
|
||
|
|
-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;
|
||
|
|
--- 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));
|