[PATCH] Fix uninitialized variable warning in do_one_initcall

[Kevin Winchester]

The warning is corrected by extracting the debug path out into
its own function.  This does en up duplicating one line of code
between the debug and regular code paths (i.e. the actual call
of the initcall function), but it seems worthwhile for the
cleaner build.

Signed-off-by: Kevin Winchester <kjwinchester@xxxxxxxxx>
---
 init/main.c |   49 ++++++++++++++++++++++++++++---------------------
 1 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/init/main.c b/init/main.c
index a42fdf4..21def42 100644
--- a/init/main.c
+++ b/init/main.c
@@ -728,30 +728,38 @@ static char msgbuf[64];
 static struct boot_trace_call call;
 static struct boot_trace_ret ret;
 
+static inline int do_one_initcall_debug(initcall_t fn)
+{
+	ktime_t calltime, rettime, delta;
+	int result;
+
+	call.caller = task_pid_nr(current);
+	printk(KERN_DEBUG "calling  %pF @ %i\n", fn, call.caller);
+	calltime = ktime_get();
+	trace_boot_call(&call, fn);
+	enable_boot_trace();
+
+	result = fn();
+
+	disable_boot_trace();
+	rettime = ktime_get();
+	delta = ktime_sub(rettime, calltime);
+	ret.duration = (unsigned long long) ktime_to_ns(delta) >> 10;
+	trace_boot_ret(&ret, fn);
+	printk(KERN_DEBUG "initcall %pF returned %d after %lld usecs\n", fn,
+		ret.result, ret.duration);
+
+	return result;
+}
+
 int do_one_initcall(initcall_t fn)
 {
 	int count = preempt_count();
-	ktime_t calltime, delta, rettime;
-
-	if (initcall_debug) {
-		call.caller = task_pid_nr(current);
-		printk("calling  %pF @ %i\n", fn, call.caller);
-		calltime = ktime_get();
-		trace_boot_call(&call, fn);
-		enable_boot_trace();
-	}
 
-	ret.result = fn();
-
-	if (initcall_debug) {
-		disable_boot_trace();
-		rettime = ktime_get();
-		delta = ktime_sub(rettime, calltime);
-		ret.duration = (unsigned long long) ktime_to_ns(delta) >> 10;
-		trace_boot_ret(&ret, fn);
-		printk("initcall %pF returned %d after %Ld usecs\n", fn,
-			ret.result, ret.duration);
-	}
+	if (initcall_debug)
+		ret.result = do_one_initcall_debug(fn);
+	else
+		ret.result = fn();
 
 	msgbuf[0] = 0;
 
@@ -773,7 +781,6 @@ int do_one_initcall(initcall_t fn)
 	return ret.result;
 }
 
-
 extern initcall_t __initcall_start[], __initcall_end[], __early_initcall_end[];
 
 static void __init do_initcalls(void)
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/