timer_list: Split timer_list_show_tickdevices

Split timer_list_show_tickdevices() into the header printout and pull
the rest up to timer_list_show. This is a preparatory patch for
converting timer_list to a proper seqfile with its own iterator

Signed-off-by: Nathan Zimmer <nzimmer@sgi.com>
Reported-by: Dave Jones <davej@redhat.com>
Cc: John Stultz <johnstul@us.ibm.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Link: http://lkml.kernel.org/r/1364345790-14577-2-git-send-email-nzimmer@sgi.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 9 insertions, 12 deletions

diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index af5a7e9f164b..380a58977490 100644
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
@@ -133,7 +133,6 @@ static void print_cpu(struct seq_file *m, int cpu, u64 now)
         struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu);
         int i;
 
-        SEQ_printf(m, "\n");
         SEQ_printf(m, "cpu: %d\n", cpu);
         for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) {
                 SEQ_printf(m, " clock %d:\n", i);
@@ -187,6 +186,7 @@ static void print_cpu(struct seq_file *m, int cpu, u64 now)
 
 #undef P
 #undef P_ns
+        SEQ_printf(m, "\n");
 }
 
 #ifdef CONFIG_GENERIC_CLOCKEVENTS
@@ -195,7 +195,6 @@ print_tickdevice(struct seq_file *m, struct tick_device *td, int cpu)
 {
         struct clock_event_device *dev = td->evtdev;
 
-        SEQ_printf(m, "\n");
         SEQ_printf(m, "Tick Device: mode:     %d\n", td->mode);
         if (cpu < 0)
                 SEQ_printf(m, "Broadcast device\n");
@@ -230,12 +229,11 @@ print_tickdevice(struct seq_file *m, struct tick_device *td, int cpu)
         print_name_offset(m, dev->event_handler);
         SEQ_printf(m, "\n");
         SEQ_printf(m, " retries:        %lu\n", dev->retries);
+        SEQ_printf(m, "\n");
 }
 
-static void timer_list_show_tickdevices(struct seq_file *m)
+static void timer_list_show_tickdevices_header(struct seq_file *m)
 {
-        int cpu;
-
 #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
         print_tickdevice(m, tick_get_broadcast_device(), -1);
         SEQ_printf(m, "tick_broadcast_mask: %08lx\n",
@@ -246,12 +244,7 @@ static void timer_list_show_tickdevices(struct seq_file *m)
 #endif
         SEQ_printf(m, "\n");
 #endif
-        for_each_online_cpu(cpu)
-                print_tickdevice(m, tick_get_device(cpu), cpu);
-        SEQ_printf(m, "\n");
 }
-#else
-static void timer_list_show_tickdevices(struct seq_file *m) { }
 #endif
 
 static int timer_list_show(struct seq_file *m, void *v)
@@ -262,12 +255,16 @@ static int timer_list_show(struct seq_file *m, void *v)
         SEQ_printf(m, "Timer List Version: v0.7\n");
         SEQ_printf(m, "HRTIMER_MAX_CLOCK_BASES: %d\n", HRTIMER_MAX_CLOCK_BASES);
         SEQ_printf(m, "now at %Ld nsecs\n", (unsigned long long)now);
+        SEQ_printf(m, "\n");
 
         for_each_online_cpu(cpu)
                 print_cpu(m, cpu, now);
 
-        SEQ_printf(m, "\n");
-        timer_list_show_tickdevices(m);
+#ifdef CONFIG_GENERIC_CLOCKEVENTS
+        timer_list_show_tickdevices_header(m);
+        for_each_online_cpu(cpu)
+                print_tickdevice(m, tick_get_device(cpu), cpu);
+#endif
 
         return 0;
 }