Split up 'do_initcalls()' into two simpler functions

One function to just loop over the entries, one function to actually do
the call and the associated debugging code.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/init/main.c b/init/main.c
index c62215146a8069c2299e73f5aa861fd09aa12785..b8bcf6da8a772715119b21a7c9b29d931de2fa1a 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -693,52 +693,57 @@ static int __init initcall_debug_setup(char *str)
 }
 __setup("initcall_debug", initcall_debug_setup);
 
-extern initcall_t __initcall_start[], __initcall_end[];
-
-static void __init do_initcalls(void)
+static void __init do_one_initcall(initcall_t fn)
 {
-       initcall_t *call;
        int count = preempt_count();
+       ktime_t t0, t1, delta;
+       char msgbuf[40];
+       int result;
 
-       for (call = __initcall_start; call < __initcall_end; call++) {
-               ktime_t t0, t1, delta;
-               char msgbuf[40];
-               int result;
-
-               if (initcall_debug) {
-                       print_fn_descriptor_symbol("calling  %s\n", *call);
-                       t0 = ktime_get();
-               }
+       if (initcall_debug) {
+               print_fn_descriptor_symbol("calling  %s\n", fn);
+               t0 = ktime_get();
+       }
 
-               result = (*call)();
+       result = fn();
 
-               if (initcall_debug) {
-                       t1 = ktime_get();
-                       delta = ktime_sub(t1, t0);
+       if (initcall_debug) {
+               t1 = ktime_get();
+               delta = ktime_sub(t1, t0);
 
-                       print_fn_descriptor_symbol("initcall %s", *call);
-                       printk(" returned %d after %Ld msecs\n", result,
-                               (unsigned long long) delta.tv64 >> 20);
-               }
+               print_fn_descriptor_symbol("initcall %s", fn);
+               printk(" returned %d after %Ld msecs\n", result,
+                       (unsigned long long) delta.tv64 >> 20);
+       }
 
-               msgbuf[0] = 0;
+       msgbuf[0] = 0;
 
-               if (result && result != -ENODEV && initcall_debug)
-                       sprintf(msgbuf, "error code %d ", result);
+       if (result && result != -ENODEV && initcall_debug)
+               sprintf(msgbuf, "error code %d ", result);
 
-               if (preempt_count() != count) {
-                       strncat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
-                       preempt_count() = count;
-               }
-               if (irqs_disabled()) {
-                       strncat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
-                       local_irq_enable();
-               }
-               if (msgbuf[0]) {
-                       print_fn_descriptor_symbol(KERN_WARNING "initcall %s", *call);
-                       printk(" returned with %s\n", msgbuf);
-               }
+       if (preempt_count() != count) {
+               strncat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
+               preempt_count() = count;
        }
+       if (irqs_disabled()) {
+               strncat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
+               local_irq_enable();
+       }
+       if (msgbuf[0]) {
+               print_fn_descriptor_symbol(KERN_WARNING "initcall %s", fn);
+               printk(" returned with %s\n", msgbuf);
+       }
+}
+
+
+extern initcall_t __initcall_start[], __initcall_end[];
+
+static void __init do_initcalls(void)
+{
+       initcall_t *call;
+
+       for (call = __initcall_start; call < __initcall_end; call++)
+               do_one_initcall(*call);
 
        /* Make sure there is no pending stuff from the initcall sequence */
        flush_scheduled_work();