target/linux/ar71xx/patches-3.3/116-MIPS-ath79-remove-ar724x_pci_add_data-function.patch

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