Simplify initcall_debug output

print_fn_descriptor_symbol() prints the address if we don't have a symbol, so
no need to print both.

Also, combine printing return value with elapsed time.  Changes this:

  Calling initcall 0xc05b7a70: pci_mmcfg_late_insert_resources+0x0/0x50()
  initcall 0xc05b7a70: pci_mmcfg_late_insert_resources+0x0/0x50() returned 1.
  initcall 0xc05b7a70 ran for 0 msecs: pci_mmcfg_late_insert_resources+0x0/0x50()
  initcall at 0xc05b7a70: pci_mmcfg_late_insert_resources+0x0/0x50(): returned with error code 1

to this:

  calling  pci_mmcfg_late_insert_resources+0x0/0x50()
  initcall pci_mmcfg_late_insert_resources+0x0/0x50() returned 1 after 0 msecs
  initcall pci_mmcfg_late_insert_resources+0x0/0x50() returned with error code 1

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 6 insertions, 14 deletions

diff --git a/init/main.c b/init/main.c
index 1687b0167c4a..1116d2f40cc1 100644
--- a/init/main.c
+++ b/init/main.c
@@ -700,10 +700,8 @@ static void __init do_initcalls(void)
                 int result;
 
                 if (initcall_debug) {
-                        printk("Calling initcall 0x%p", *call);
-                        print_fn_descriptor_symbol(": %s()",
+                        print_fn_descriptor_symbol("calling  %s()\n",
                                         (unsigned long) *call);
-                        printk("\n");
                         t0 = ktime_get();
                 }
 
@@ -713,15 +711,10 @@ static void __init do_initcalls(void)
                         t1 = ktime_get();
                         delta = ktime_sub(t1, t0);
 
-                        printk("initcall 0x%p", *call);
-                        print_fn_descriptor_symbol(": %s()",
+                        print_fn_descriptor_symbol("initcall %s()",
                                         (unsigned long) *call);
-                        printk(" returned %d.\n", result);
-
-                        printk("initcall 0x%p ran for %Ld msecs: ",
-                                *call, (unsigned long long)delta.tv64 >> 20);
-                        print_fn_descriptor_symbol("%s()\n",
-                                (unsigned long) *call);
+                        printk(" returned %d after %Ld msecs\n", result,
+                                (unsigned long long) delta.tv64 >> 20);
                 }
 
                 if (result && result != -ENODEV && initcall_debug) {
@@ -737,10 +730,9 @@ static void __init do_initcalls(void)
                         local_irq_enable();
                 }
                 if (msg) {
-                        printk(KERN_WARNING "initcall at 0x%p", *call);
-                        print_fn_descriptor_symbol(": %s()",
+                        print_fn_descriptor_symbol(KERN_WARNING "initcall %s()",
                                         (unsigned long) *call);
-                        printk(": returned with %s\n", msg);
+                        printk(" returned with %s\n", msg);
                 }
         }