[PATCH] [POWERPC] Make ppc440spe_init_pcie() static
Roland Dreier
rdreier at cisco.com
Tue Nov 14 04:57:02 EST 2006
ppc440spe_init_pcie() is only called from the file where it's defined
(except for dead code, which we remove in this patch).
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
Just a minor cleanup since I was looking at the code anyway. Please
queue for 2.6.20 too.
arch/ppc/platforms/4xx/yucca.c | 5 -----
arch/ppc/syslib/ppc440spe_pcie.c | 2 +-
arch/ppc/syslib/ppc440spe_pcie.h | 1 -
3 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/arch/ppc/platforms/4xx/yucca.c b/arch/ppc/platforms/4xx/yucca.c
index 346787d..6c60d53 100644
--- a/arch/ppc/platforms/4xx/yucca.c
+++ b/arch/ppc/platforms/4xx/yucca.c
@@ -239,11 +239,6 @@ yucca_setup_hoses(void)
char name[20];
int i;
- if (0 && ppc440spe_init_pcie()) {
- printk(KERN_WARNING "PPC440SPe PCI Express initialization failed\n");
- return;
- }
-
for (i = 0; i <= 2; ++i) {
if (!yucca_pcie_card_present(i))
continue;
diff --git a/arch/ppc/syslib/ppc440spe_pcie.c b/arch/ppc/syslib/ppc440spe_pcie.c
index 7ae14d2..fb0ddf1 100644
--- a/arch/ppc/syslib/ppc440spe_pcie.c
+++ b/arch/ppc/syslib/ppc440spe_pcie.c
@@ -159,7 +159,7 @@ static void check_error(void)
/*
* Initialize PCI Express core as described in User Manual section 27.12.1
*/
-int ppc440spe_init_pcie(void)
+static int ppc440spe_init_pcie(void)
{
int i;
diff --git a/arch/ppc/syslib/ppc440spe_pcie.h b/arch/ppc/syslib/ppc440spe_pcie.h
index 55b765a..23fe164 100644
--- a/arch/ppc/syslib/ppc440spe_pcie.h
+++ b/arch/ppc/syslib/ppc440spe_pcie.h
@@ -142,7 +142,6 @@ #define PECFG_PIM0LAH 0x344
#define PECFG_POM0LAL 0x380
#define PECFG_POM0LAH 0x384
-int ppc440spe_init_pcie(void);
int ppc440spe_init_pcie_rootport(int port);
void ppc440spe_setup_pcie(struct pci_controller *hose, int port);
--
1.4.3.2
More information about the Linuxppc-embedded
mailing list