1 From db36c9d6a6be232bdee245407fc8ccde53ea69c6 Mon Sep 17 00:00:00 2001
2 From: Gabor Juhos <juhosg@openwrt.org>
3 Date: Mon, 4 Feb 2013 11:58:49 +0100
4 Subject: [PATCH] MIPS: ath79: remove unused ar7{1x,24}x_pcibios_init
7 commit 6e783865b4e60f2ecf7708f8ea24db5c5ea07ced upstream.
9 The functions are unused now, so remove them.
11 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
12 Patchwork: http://patchwork.linux-mips.org/patch/4909/
13 Signed-off-by: John Crispin <blogic@openwrt.org>
15 arch/mips/ath79/pci.c | 1 -
16 arch/mips/include/asm/mach-ath79/pci.h | 28 ----------------------------
17 arch/mips/pci/pci-ar71xx.c | 26 --------------------------
18 arch/mips/pci/pci-ar724x.c | 32 --------------------------------
19 4 files changed, 87 deletions(-)
20 delete mode 100644 arch/mips/include/asm/mach-ath79/pci.h
22 --- a/arch/mips/ath79/pci.c
23 +++ b/arch/mips/ath79/pci.c
25 #include <asm/mach-ath79/ar71xx_regs.h>
26 #include <asm/mach-ath79/ath79.h>
27 #include <asm/mach-ath79/irq.h>
28 -#include <asm/mach-ath79/pci.h>
31 static int (*ath79_pci_plat_dev_init)(struct pci_dev *dev);
32 --- a/arch/mips/include/asm/mach-ath79/pci.h
36 - * Atheros AR71XX/AR724X PCI support
38 - * Copyright (C) 2011 René Bolldorf <xsecute@googlemail.com>
39 - * Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>
40 - * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
42 - * This program is free software; you can redistribute it and/or modify it
43 - * under the terms of the GNU General Public License version 2 as published
44 - * by the Free Software Foundation.
47 -#ifndef __ASM_MACH_ATH79_PCI_H
48 -#define __ASM_MACH_ATH79_PCI_H
50 -#if defined(CONFIG_PCI) && defined(CONFIG_SOC_AR71XX)
51 -int ar71xx_pcibios_init(void);
53 -static inline int ar71xx_pcibios_init(void) { return 0; }
56 -#if defined(CONFIG_PCI_AR724X)
57 -int ar724x_pcibios_init(int irq);
59 -static inline int ar724x_pcibios_init(int irq) { return 0; }
62 -#endif /* __ASM_MACH_ATH79_PCI_H */
63 --- a/arch/mips/pci/pci-ar71xx.c
64 +++ b/arch/mips/pci/pci-ar71xx.c
67 #include <asm/mach-ath79/ar71xx_regs.h>
68 #include <asm/mach-ath79/ath79.h>
69 -#include <asm/mach-ath79/pci.h>
71 #define AR71XX_PCI_REG_CRP_AD_CBE 0x00
72 #define AR71XX_PCI_REG_CRP_WRDATA 0x04
73 @@ -335,31 +334,6 @@ static void ar71xx_pci_reset(void)
77 -__init int ar71xx_pcibios_init(void)
81 - ar71xx_pcicfg_base = ioremap(AR71XX_PCI_CFG_BASE, AR71XX_PCI_CFG_SIZE);
82 - if (ar71xx_pcicfg_base == NULL)
87 - /* setup COMMAND register */
88 - t = PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE
89 - | PCI_COMMAND_PARITY | PCI_COMMAND_SERR | PCI_COMMAND_FAST_BACK;
90 - ar71xx_pci_local_write(PCI_COMMAND, 4, t);
92 - /* clear bus errors */
93 - ar71xx_pci_check_error(1);
95 - ar71xx_pci_irq_init(ATH79_CPU_IRQ_IP2);
97 - register_pci_controller(&ar71xx_pci_controller);
102 static int ar71xx_pci_probe(struct platform_device *pdev)
104 struct resource *res;
105 --- a/arch/mips/pci/pci-ar724x.c
106 +++ b/arch/mips/pci/pci-ar724x.c
108 #include <linux/platform_device.h>
109 #include <asm/mach-ath79/ath79.h>
110 #include <asm/mach-ath79/ar71xx_regs.h>
111 -#include <asm/mach-ath79/pci.h>
113 #define AR724X_PCI_REG_RESET 0x18
114 #define AR724X_PCI_REG_INT_STATUS 0x4c
115 @@ -276,37 +275,6 @@ static void ar724x_pci_irq_init(int irq)
116 irq_set_chained_handler(irq, ar724x_pci_irq_handler);
119 -int ar724x_pcibios_init(int irq)
125 - ar724x_pci_devcfg_base = ioremap(AR724X_PCI_CFG_BASE,
126 - AR724X_PCI_CFG_SIZE);
127 - if (ar724x_pci_devcfg_base == NULL)
130 - ar724x_pci_ctrl_base = ioremap(AR724X_PCI_CTRL_BASE,
131 - AR724X_PCI_CTRL_SIZE);
132 - if (ar724x_pci_ctrl_base == NULL)
133 - goto err_unmap_devcfg;
135 - ar724x_pci_link_up = ar724x_pci_check_link();
136 - if (!ar724x_pci_link_up)
137 - pr_warn("ar724x: PCIe link is down\n");
139 - ar724x_pci_irq_init(irq);
140 - register_pci_controller(&ar724x_pci_controller);
142 - return PCIBIOS_SUCCESSFUL;
145 - iounmap(ar724x_pci_devcfg_base);
150 static int ar724x_pci_probe(struct platform_device *pdev)
152 struct resource *res;