From: Josh Boyer Date: Tue, 12 Jul 2011 20:37:50 +0000 (-0400) Subject: powerpc/4xx: Move PCIE printk to proper function X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a8e616b9a41212655042f59c969f30bb7de1ec73;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Josh Boyer --- diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c index ad330fe69c26..3cf59b661156 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. *