target/linux/ar71xx/patches-3.2/118-MIPS-ath79-remove-ar724x_pci_add_data-function.patch

   1 From 0b026adc7a471edd018a060427e62d06e54be2bc Mon Sep 17 00:00:00 2001
   2 From: Gabor Juhos <juhosg@openwrt.org>
   3 Date: Sun, 20 Nov 2011 15:50:32 +0100
   4 Subject: [PATCH 18/35] MIPS: ath79: remove ar724x_pci_add_data function
   5
   6 The variables set by this function are not used anymore.
   7 Remove the function and the relevant variables as well.
   8
   9 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  10
  11 v2: - no changes
  12 ---
  13  arch/mips/ath79/mach-ubnt-xm.c |    7 -------
  14  arch/mips/ath79/pci.c          |    8 --------
  15  arch/mips/ath79/pci.h          |    6 ------
  16  3 files changed, 0 insertions(+), 21 deletions(-)
  17
  18 --- a/arch/mips/ath79/mach-ubnt-xm.c
  19 +++ b/arch/mips/ath79/mach-ubnt-xm.c
  20 @@ -82,12 +82,6 @@ static struct ath79_spi_platform_data ub
  21  #ifdef CONFIG_PCI
  22  static struct ath9k_platform_data ubnt_xm_eeprom_data;
  23
  24 -static struct ar724x_pci_data ubnt_xm_pci_data[] = {
  25 -       {
  26 -               .irq    = ATH79_PCI_IRQ(0),
  27 -       },
  28 -};
  29 -
  30  static int ubnt_xm_pci_plat_dev_init(struct pci_dev *dev)
  31  {
  32         switch (PCI_SLOT(dev->devfn)) {
  33 @@ -104,7 +98,6 @@ static void __init ubnt_xm_pci_init(void
  34         memcpy(ubnt_xm_eeprom_data.eeprom_data, UBNT_XM_EEPROM_ADDR,
  35                sizeof(ubnt_xm_eeprom_data.eeprom_data));
  36
  37 -       ar724x_pci_add_data(ubnt_xm_pci_data, ARRAY_SIZE(ubnt_xm_pci_data));
  38         ath79_pci_set_plat_dev_init(ubnt_xm_pci_plat_dev_init);
  39         ath79_register_pci();
  40  }
  41 --- a/arch/mips/ath79/pci.c
  42 +++ b/arch/mips/ath79/pci.c
  43 @@ -18,8 +18,6 @@
  44  static int (*ath79_pci_plat_dev_init)(struct pci_dev *dev);
  45  static const struct ath79_pci_irq *ath79_pci_irq_map __initdata;
  46  static unsigned ath79_pci_nr_irqs __initdata;
  47 -static struct ar724x_pci_data *pci_data;
  48 -static int pci_data_size;
  49
  50  static const struct ath79_pci_irq ar71xx_pci_irq_map[] __initconst = {
  51         {
  52 @@ -45,12 +43,6 @@ static const struct ath79_pci_irq ar724x
  53         }
  54  };
  55
  56 -void ar724x_pci_add_data(struct ar724x_pci_data *data, int size)
  57 -{
  58 -       pci_data        = data;
  59 -       pci_data_size   = size;
  60 -}
  61 -
  62  int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin)
  63  {
  64         int irq = -1;
  65 --- a/arch/mips/ath79/pci.h
  66 +++ b/arch/mips/ath79/pci.h
  67 @@ -11,18 +11,12 @@
  68  #ifndef _ATH79_PCI_H
  69  #define _ATH79_PCI_H
  70
  71 -struct ar724x_pci_data {
  72 -       int irq;
  73 -};
  74 -
  75  struct ath79_pci_irq {
  76         u8      slot;
  77         u8      pin;
  78         int     irq;
  79  };
  80
  81 -void ar724x_pci_add_data(struct ar724x_pci_data *data, int size);
  82 -
  83  #ifdef CONFIG_PCI
  84  void ath79_pci_set_irq_map(unsigned nr_irqs, const struct ath79_pci_irq *map);
  85  void ath79_pci_set_plat_dev_init(int (*func)(struct pci_dev *dev));