Skip to contentSkip to conversation

kernel/trace: Use pr_<level> consistently

PATCH New Joe Perches 1 participant 1 message Mar 1, 2010

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel/trace: Use pr_<level> consistently

There are existing uses of pr_<level>,
convert the rest of the printks to match.

Except for complete sentences, consistently use no periods at EOM Coalesce long formats
Add spaces to coalesced formats when words were run together Add newlines to some messages
Fix message grammar "are failed" and typo "Faild"

---
 kernel/trace/ftrace.c             |   12 +++----
 kernel/trace/ring_buffer.c        |    9 ++---
 kernel/trace/trace.c              |   21 ++++++-------
 kernel/trace/trace_branch.c       |    9 ++----
 kernel/trace/trace_events.c       |   53 ++++++++++++++-------------------
 kernel/trace/trace_kprobe.c       |   58 +++++++++++++++++-------------------
 kernel/trace/trace_ksym.c         |    6 +--
 kernel/trace/trace_mmiotrace.c    |    2 +-
 kernel/trace/trace_output.c       |    6 ++--
 kernel/trace/trace_sched_switch.c |    9 ++----
 kernel/trace/trace_sched_wakeup.c |   12 ++-----
 kernel/trace/trace_selftest.c     |   53 ++++++++++++++++-----------------
 kernel/trace/trace_stat.c         |    3 +-
 kernel/trace/trace_syscalls.c     |    6 +--
 14 files changed, 114 insertions(+), 145 deletions(-)
kernel/trace/ftrace.c +5 -7
index 8378357..53d83c1 100644
@@ -821,8 +821,7 @@ static __init void ftrace_profile_debugfs(struct dentry *d_tracer)
 	entry = debugfs_create_file("function_profile_enabled", 0644,
 				    d_tracer, NULL, &ftrace_profile_fops);
 	if (!entry)
-		pr_warning("Could not create debugfs "
-			   "'function_profile_enabled' entry\n");
+		pr_warning("Could not create debugfs 'function_profile_enabled' entry\n");
 }
 
 #else /* CONFIG_FUNCTION_PROFILER */
@@ -960,10 +959,10 @@ static void print_ip_ins(const char *fmt, unsigned char *p)
 {
 	int i;
 
-	printk(KERN_CONT "%s", fmt);
+	pr_cont("%s", fmt);
 
 	for (i = 0; i < MCOUNT_INSN_SIZE; i++)
-		printk(KERN_CONT "%s%02x", i ? ":" : "", p[i]);
+		pr_cont("%s%02x", i ? ":" : "", p[i]);
 }
 
 static void ftrace_bug(int failed, unsigned long ip)
@@ -979,7 +978,7 @@ static void ftrace_bug(int failed, unsigned long ip)
 		pr_info("ftrace failed to modify ");
 		print_ip_sym(ip);
 		print_ip_ins(" actual: ", (unsigned char *)ip);
-		printk(KERN_CONT "\n");
+		pr_cont("\n");
 		break;
 	case -EPERM:
 		FTRACE_WARN_ON_ONCE(1);
@@ -3266,8 +3265,7 @@ static int start_graph_tracing(void)
 	if (!ret) {
 		ret = register_trace_sched_switch(ftrace_graph_probe_sched_switch);
 		if (ret)
-			pr_info("ftrace_graph: Couldn't activate tracepoint"
-				" probe to kernel_sched_switch\n");
+			pr_info("ftrace_graph: Couldn't activate tracepoint probe to kernel_sched_switch\n");
 	}
 
 	kfree(ret_stack_list);
kernel/trace/ring_buffer.c +4 -5
index 8c1b2d2..9a32277 100644
@@ -1971,11 +1971,10 @@ rb_add_time_stamp(struct ring_buffer_per_cpu *cpu_buffer,
 	int ret;
 
 	if (unlikely(*delta > (1ULL << 59) && !once++)) {
-		printk(KERN_WARNING "Delta way too big! %llu"
-		       " ts=%llu write stamp = %llu\n",
-		       (unsigned long long)*delta,
-		       (unsigned long long)*ts,
-		       (unsigned long long)cpu_buffer->write_stamp);
+		pr_warning("Delta way too big! %llu ts=%llu write stamp = %llu\n",
+			   (unsigned long long)*delta,
+			   (unsigned long long)*ts,
+			   (unsigned long long)cpu_buffer->write_stamp);
 		WARN_ON(1);
 	}
 
kernel/trace/trace.c +10 -11
index 032c57c..669e46f 100644
@@ -720,8 +720,7 @@ __acquires(kernel_lock)
 	for (t = trace_types; t; t = t->next) {
 		if (strcmp(type->name, t->name) == 0) {
 			/* already found */
-			pr_info("Tracer %s already registered\n",
-				type->name);
+			pr_info("Tracer %s already registered\n", type->name);
 			ret = -1;
 			goto out;
 		}
@@ -759,13 +758,13 @@ __acquires(kernel_lock)
 		/* the test is responsible for resetting too */
 		current_trace = saved_tracer;
 		if (ret) {
-			printk(KERN_CONT "FAILED!\n");
+			pr_cont("FAILED!\n");
 			goto out;
 		}
 		/* Only reset on passing, to avoid touching corrupted buffers */
 		tracing_reset_online_cpus(tr);
 
-		printk(KERN_CONT "PASSED\n");
+		pr_cont("PASSED\n");
 	}
 #endif
 
@@ -782,15 +781,15 @@ __acquires(kernel_lock)
 	if (strncmp(default_bootup_tracer, type->name, MAX_TRACER_SIZE))
 		goto out_unlock;
 
-	printk(KERN_INFO "Starting tracer '%s'\n", type->name);
+	pr_info("Starting tracer '%s'\n", type->name);
 	/* Do we want this tracer to start on bootup? */
 	tracing_set_tracer(type->name);
 	default_bootup_tracer = NULL;
 	/* disable other selftests, since this will break it. */
 	tracing_selftest_disabled = 1;
 #ifdef CONFIG_FTRACE_STARTUP_TEST
-	printk(KERN_INFO "Disabling FTRACE selftests due to running tracer '%s'\n",
-	       type->name);
+	pr_info("Disabling FTRACE selftests due to running tracer '%s'\n",
+		type->name);
 #endif
 
  out_unlock:
@@ -4472,7 +4471,7 @@ __init static int tracer_alloc_buffers(void)
 	global_trace.buffer = ring_buffer_alloc(ring_buf_size,
 						   TRACE_BUFFER_FLAGS);
 	if (!global_trace.buffer) {
-		printk(KERN_ERR "tracer: failed to allocate ring buffer!\n");
+		pr_err("tracer: failed to allocate ring buffer!\n");
 		WARN_ON(1);
 		goto out_free_cpumask;
 	}
@@ -4483,7 +4482,7 @@ __init static int tracer_alloc_buffers(void)
 	max_tr.buffer = ring_buffer_alloc(ring_buf_size,
 					     TRACE_BUFFER_FLAGS);
 	if (!max_tr.buffer) {
-		printk(KERN_ERR "tracer: failed to allocate max ring buffer!\n");
+		pr_err("tracer: failed to allocate max ring buffer!\n");
 		WARN_ON(1);
 		ring_buffer_free(global_trace.buffer);
 		goto out_free_cpumask;
@@ -4535,8 +4534,8 @@ __init static int clear_boot_tracer(void)
 	if (!default_bootup_tracer)
 		return 0;
 
-	printk(KERN_INFO "ftrace bootup tracer '%s' not registered.\n",
-	       default_bootup_tracer);
+	pr_info("ftrace bootup tracer '%s' not registered\n",
+		default_bootup_tracer);
 	default_bootup_tracer = NULL;
 
 	return 0;
kernel/trace/trace_branch.c +3 -6
index b9bc4d4..5a01f27 100644
@@ -189,8 +189,7 @@ __init static int init_branch_tracer(void)
 
 	ret = register_ftrace_event(&trace_branch_event);
 	if (!ret) {
-		printk(KERN_WARNING "Warning: could not register "
-				    "branch events\n");
+		pr_warning("Warning: could not register branch events\n");
 		return 1;
 	}
 	return register_tracer(&branch_trace);
@@ -341,8 +340,7 @@ __init static int init_annotated_branch_stats(void)
 
 	ret = register_stat_tracer(&annotated_branch_stats);
 	if (!ret) {
-		printk(KERN_WARNING "Warning: could not register "
-				    "annotated branches stats\n");
+		pr_warning("Warning: could not register annotated branches stats\n");
 		return 1;
 	}
 	return 0;
@@ -397,8 +395,7 @@ __init static int all_annotated_branch_stats(void)
 
 	ret = register_stat_tracer(&all_branch_stats);
 	if (!ret) {
-		printk(KERN_WARNING "Warning: could not register "
-				    "all branches stats\n");
+		pr_warning("Warning: could not register all branches stats\n");
 		return 1;
 	}
 	return 0;
kernel/trace/trace_events.c +23 -30

141 lines not on this page · raw message

kernel/trace/trace_kprobe.c +27 -31

197 lines not on this page · raw message

kernel/trace/trace_ksym.c +2 -4
index 94103cd..37f6b81 100644
@@ -181,8 +181,7 @@ int process_new_ksym_entry(char *ksymname, int op, unsigned long addr)
 	int ret = -ENOMEM;
 
 	if (ksym_filter_entry_count >= KSYM_TRACER_MAX) {
-		printk(KERN_ERR "ksym_tracer: Maximum limit:(%d) reached. No"
-		" new requests for tracing can be accepted now.\n",
+		pr_err("ksym_tracer: Maximum limit:(%d) reached. No new requests for tracing can be accepted now.\n",
 			KSYM_TRACER_MAX);
 		return -ENOSPC;
 	}
@@ -202,8 +201,7 @@ int process_new_ksym_entry(char *ksymname, int op, unsigned long addr)
 
 	if (IS_ERR(entry->ksym_hbp)) {
 		ret = PTR_ERR(entry->ksym_hbp);
-		printk(KERN_INFO "ksym_tracer request failed. Try again"
-					" later!!\n");
+		pr_info("ksym_tracer request failed. Try again later!!\n");
 		goto err;
 	}
 
kernel/trace/trace_mmiotrace.c +1 -1
index 0acd834..a65a000 100644
@@ -148,7 +148,7 @@ static ssize_t mmio_read(struct trace_iterator *iter, struct file *filp,
 		/* XXX: This is later than where events were lost. */
 		trace_seq_printf(s, "MARK 0.000000 Lost %lu events.\n", n);
 		if (!overrun_detected)
-			pr_warning("mmiotrace has lost events.\n");
+			pr_warning("mmiotrace has lost events\n");
 		overrun_detected = true;
 		goto print_out;
 	}
kernel/trace/trace_output.c +3 -3
index 8e46b33..ffab488 100644
@@ -749,7 +749,7 @@ int register_ftrace_event(struct trace_event *event)
 		list_add_tail(&event->list, list);
 
 	} else if (event->type > __TRACE_LAST_TYPE) {
-		printk(KERN_WARNING "Need to add type to trace.h\n");
+		pr_warning("Need to add type to trace.h\n");
 		WARN_ON(1);
 		goto out;
 	} else {
@@ -1269,8 +1269,8 @@ __init static int init_events(void)
 
 		ret = register_ftrace_event(event);
 		if (!ret) {
-			printk(KERN_WARNING "event %d failed to register\n",
-			       event->type);
+			pr_warning("event %d failed to register\n",
+				   event->type);
 			WARN_ON_ONCE(1);
 		}
 	}
kernel/trace/trace_sched_switch.c +3 -6
index 5fca0f5..7500ad5 100644
@@ -141,22 +141,19 @@ static int tracing_sched_register(void)
 
 	ret = register_trace_sched_wakeup(probe_sched_wakeup);
 	if (ret) {
-		pr_info("wakeup trace: Couldn't activate tracepoint"
-			" probe to kernel_sched_wakeup\n");
+		pr_info("wakeup trace: Couldn't activate tracepoint probe to kernel_sched_wakeup\n");
 		return ret;
 	}
 
 	ret = register_trace_sched_wakeup_new(probe_sched_wakeup);
 	if (ret) {
-		pr_info("wakeup trace: Couldn't activate tracepoint"
-			" probe to kernel_sched_wakeup_new\n");
+		pr_info("wakeup trace: Couldn't activate tracepoint probe to kernel_sched_wakeup_new\n");
 		goto fail_deprobe;
 	}
 
 	ret = register_trace_sched_switch(probe_sched_switch);
 	if (ret) {
-		pr_info("sched trace: Couldn't activate tracepoint"
-			" probe to kernel_sched_switch\n");
+		pr_info("sched trace: Couldn't activate tracepoint probe to kernel_sched_switch\n");
 		goto fail_deprobe_wake_new;
 	}
 
kernel/trace/trace_sched_wakeup.c +4 -8
index 0271742..db99a58 100644
@@ -266,29 +266,25 @@ static void start_wakeup_tracer(struct trace_array *tr)
 
 	ret = register_trace_sched_wakeup(probe_wakeup);
 	if (ret) {
-		pr_info("wakeup trace: Couldn't activate tracepoint"
-			" probe to kernel_sched_wakeup\n");
+		pr_info("wakeup trace: Couldn't activate tracepoint probe to kernel_sched_wakeup\n");
 		return;
 	}
 
 	ret = register_trace_sched_wakeup_new(probe_wakeup);
 	if (ret) {
-		pr_info("wakeup trace: Couldn't activate tracepoint"
-			" probe to kernel_sched_wakeup_new\n");
+		pr_info("wakeup trace: Couldn't activate tracepoint probe to kernel_sched_wakeup_new\n");
 		goto fail_deprobe;
 	}
 
 	ret = register_trace_sched_switch(probe_wakeup_sched_switch);
 	if (ret) {
-		pr_info("sched trace: Couldn't activate tracepoint"
-			" probe to kernel_sched_switch\n");
+		pr_info("sched trace: Couldn't activate tracepoint probe to kernel_sched_switch\n");
 		goto fail_deprobe_wake_new;
 	}
 
 	ret = register_trace_sched_migrate_task(probe_wakeup_migrate_task);
 	if (ret) {
-		pr_info("wakeup trace: Couldn't activate tracepoint"
-			" probe to kernel_sched_migrate_task\n");
+		pr_info("wakeup trace: Couldn't activate tracepoint probe to kernel_sched_migrate_task\n");
 		return;
 	}
 
kernel/trace/trace_selftest.c +26 -27

200 lines not on this page · raw message

kernel/trace/trace_stat.c +1 -2
index a4bb239..5be4d73 100644
@@ -309,8 +309,7 @@ static int tracing_stat_init(void)
 
 	stat_dir = debugfs_create_dir("trace_stat", d_tracing);
 	if (!stat_dir)
-		pr_warning("Could not create debugfs "
-			   "'trace_stat' entry\n");
+		pr_warning("Could not create debugfs 'trace_stat' entry\n");
 	return 0;
 }
 
kernel/trace/trace_syscalls.c +2 -4
index cba47d7..6ea6c54 100644
@@ -481,8 +481,7 @@ int prof_sysenter_enable(struct ftrace_event_call *call)
 	if (!sys_prof_refcount_enter)
 		ret = register_trace_sys_enter(prof_syscall_enter);
 	if (ret) {
-		pr_info("event trace: Could not activate"
-				"syscall entry trace point");
+		pr_info("event trace: Could not activate syscall entry trace point\n");
 	} else {
 		set_bit(num, enabled_prof_enter_syscalls);
 		sys_prof_refcount_enter++;
@@ -556,8 +555,7 @@ int prof_sysexit_enable(struct ftrace_event_call *call)
 	if (!sys_prof_refcount_exit)
 		ret = register_trace_sys_exit(prof_syscall_exit);
 	if (ret) {
-		pr_info("event trace: Could not activate"
-				"syscall exit trace point");
+		pr_info("event trace: Could not activate syscall exit trace point\n");
 	} else {
 		set_bit(num, enabled_prof_exit_syscalls);
 		sys_prof_refcount_exit++;