diff options
author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2011-07-12 16:37:50 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2011-07-12 16:37:50 -0400 |
commit | a8e616b9a41212655042f59c969f30bb7de1ec73 (patch) | |
tree | 78a0ac07591fde8a85561d17d60b4199175b63c0 /arch/powerpc | |
parent | 9661534d6ad75f881d8bbeb73dd7372f41cbad99 (diff) |
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>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/sysdev/ppc4xx_pci.c | 5 |
1 files changed, 2 insertions, 3 deletions
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, | |||
679 | 679 | ||
680 | static int __init ppc4xx_pciex_port_reset_sdr(struct ppc4xx_pciex_port *port) | 680 | static int __init ppc4xx_pciex_port_reset_sdr(struct ppc4xx_pciex_port *port) |
681 | { | 681 | { |
682 | printk(KERN_INFO "PCIE%d: Checking link...\n", | ||
683 | port->index); | ||
684 | |||
685 | /* Wait for reset to complete */ | 682 | /* Wait for reset to complete */ |
686 | if (ppc4xx_pciex_wait_on_sdr(port, PESDRn_RCSSTS, 1 << 20, 0, 10)) { | 683 | if (ppc4xx_pciex_wait_on_sdr(port, PESDRn_RCSSTS, 1 << 20, 0, 10)) { |
687 | printk(KERN_WARNING "PCIE%d: PGRST failed\n", | 684 | 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) | |||
693 | 690 | ||
694 | static void __init ppc4xx_pciex_check_link_sdr(struct ppc4xx_pciex_port *port) | 691 | static void __init ppc4xx_pciex_check_link_sdr(struct ppc4xx_pciex_port *port) |
695 | { | 692 | { |
693 | printk(KERN_INFO "PCIE%d: Checking link...\n", port->index); | ||
694 | |||
696 | /* Check for card presence detect if supported, if not, just wait for | 695 | /* Check for card presence detect if supported, if not, just wait for |
697 | * link unconditionally. | 696 | * link unconditionally. |
698 | * | 697 | * |