From 31b9b817106f4c698324085f1086f3a5f4a8f246 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 12 Jul 2011 16:37:50 -0400 Subject: [PATCH] --- yaml --- r: 259175 b: refs/heads/master c: a8e616b9a41212655042f59c969f30bb7de1ec73 h: refs/heads/master i: 259173: afa5c8fc9bb4a8684397c580afd28bd06543b1e1 259171: ac9f53f9fb95331b110e3e54fc144152ca08bfdd 259167: f5f0c0582ad8ac04068bc78ac097aeaf717bd9eb v: v3 --- [refs] | 2 +- trunk/arch/powerpc/sysdev/ppc4xx_pci.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 62dfab590fea..e3a6cffdb524 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9661534d6ad75f881d8bbeb73dd7372f41cbad99 +refs/heads/master: a8e616b9a41212655042f59c969f30bb7de1ec73 diff --git a/trunk/arch/powerpc/sysdev/ppc4xx_pci.c b/trunk/arch/powerpc/sysdev/ppc4xx_pci.c index ad330fe69c26..3cf59b661156 100644 --- a/trunk/arch/powerpc/sysdev/ppc4xx_pci.c +++ b/trunk/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. *