From a8e616b9a41212655042f59c969f30bb7de1ec73 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Date: Tue, 12 Jul 2011 16:37:50 -0400
Subject: powerpc/4xx: Move PCIE printk to proper function

Move the "Checking link..." printk to the function that actually checks the
linke.

Reported-by: Ayman El-Khashab <ayman@elkhashab.com>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
---
 arch/powerpc/sysdev/ppc4xx_pci.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'arch/powerpc')

diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c
index ad330fe69c2..3cf59b66115 100644
--- a/arch/powerpc/sysdev/ppc4xx_pci.c
+++ b/arch/powerpc/sysdev/ppc4xx_pci.c
@@ -679,9 +679,6 @@ static int __init ppc4xx_pciex_wait_on_sdr(struct ppc4xx_pciex_port *port,
 
 static int __init ppc4xx_pciex_port_reset_sdr(struct ppc4xx_pciex_port *port)
 {
-	printk(KERN_INFO "PCIE%d: Checking link...\n",
-	       port->index);
-
 	/* Wait for reset to complete */
 	if (ppc4xx_pciex_wait_on_sdr(port, PESDRn_RCSSTS, 1 << 20, 0, 10)) {
 		printk(KERN_WARNING "PCIE%d: PGRST failed\n",
@@ -693,6 +690,8 @@ static int __init ppc4xx_pciex_port_reset_sdr(struct ppc4xx_pciex_port *port)
 
 static void __init ppc4xx_pciex_check_link_sdr(struct ppc4xx_pciex_port *port)
 {
+	printk(KERN_INFO "PCIE%d: Checking link...\n", port->index);
+
 	/* Check for card presence detect if supported, if not, just wait for
 	 * link unconditionally.
 	 *
-- 
cgit v1.2.3-18-g5258