Skip to contentSkip to conversation

tracing: Remove duplicate warnings

PATCH Superseded Yuntao Wang 2 participants 3 messages Jan 9, 2022 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tracing: Remove duplicate warnings

Since the same warning message is already printed in the trace_create_file() function, there is no need to print it again.

---
 kernel/trace/trace_events.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
kernel/trace/trace_events.c +2 -7
index 92be9cb1d7d4..d7da46df16c5 100644
@@ -3462,7 +3462,6 @@ create_event_toplevel_files(struct dentry *parent, struct trace_array *tr)
 	entry = trace_create_file("enable", TRACE_MODE_WRITE, d_events,
 				  tr, &ftrace_tr_enable_fops);
 	if (!entry) {
-		pr_warn("Could not create tracefs 'enable' entry\n");
 		return -ENOMEM;
 	}
 
@@ -3480,17 +3479,13 @@ create_event_toplevel_files(struct dentry *parent, struct trace_array *tr)
 		pr_warn("Could not create tracefs 'set_event_notrace_pid' entry\n");
 
 	/* ring buffer internal formats */
-	entry = trace_create_file("header_page", TRACE_MODE_READ, d_events,
+	trace_create_file("header_page", TRACE_MODE_READ, d_events,
 				  ring_buffer_print_page_header,
 				  &ftrace_show_header_fops);
-	if (!entry)
-		pr_warn("Could not create tracefs 'header_page' entry\n");
 
-	entry = trace_create_file("header_event", TRACE_MODE_READ, d_events,
+	trace_create_file("header_event", TRACE_MODE_READ, d_events,
 				  ring_buffer_print_entry_header,
 				  &ftrace_show_header_fops);
-	if (!entry)
-		pr_warn("Could not create tracefs 'header_event' entry\n");
 
 	tr->event_dir = d_events;
 
Signature · 1 line
2.34.1
maintainer
#1 lore raw

kernel/trace/trace_events.c create_event_toplevel_files(struct dentry *parent, struct trace_array *tr) · line 3466

Quoted 11 lines · On Sun, 9 Jan 2022 21:48:58 +0800 Yuntao Wang <[email protected]> wrote:
kernel/trace/trace_events.c +0 -1
index 92be9cb1d7d4..d7da46df16c5 100644
@@ -3462,7 +3462,6 @@ create_event_toplevel_files(struct dentry *parent, struct trace_array *tr)
 	entry = trace_create_file("enable", TRACE_MODE_WRITE, d_events,
 				  tr, &ftrace_tr_enable_fops);
 	if (!entry) {
-		pr_warn("Could not create tracefs 'enable' entry\n");
 		return -ENOMEM;
 	}

If it is becoming a simple condition then you don't need the braces.

	if (!entry)
		return -ENOMEM;

-- Steve

#2 lore raw

PATCH v2 1/1 tracing: Remove duplicate warnings

Since the same warning message is already printed in the trace_create_file() function, there is no need to print it again.

---
Changes since v1:
- remove unnecessary braces

 kernel/trace/trace_events.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
kernel/trace/trace_events.c +3 -9
index 92be9cb1d7d4..3147614c1812 100644
@@ -3461,10 +3461,8 @@ create_event_toplevel_files(struct dentry *parent, struct trace_array *tr)
 
 	entry = trace_create_file("enable", TRACE_MODE_WRITE, d_events,
 				  tr, &ftrace_tr_enable_fops);
-	if (!entry) {
-		pr_warn("Could not create tracefs 'enable' entry\n");
+	if (!entry)
 		return -ENOMEM;
-	}
 
 	/* There are not as crucial, just warn if they are not created */
 
@@ -3480,17 +3478,13 @@ create_event_toplevel_files(struct dentry *parent, struct trace_array *tr)
 		pr_warn("Could not create tracefs 'set_event_notrace_pid' entry\n");
 
 	/* ring buffer internal formats */
-	entry = trace_create_file("header_page", TRACE_MODE_READ, d_events,
+	trace_create_file("header_page", TRACE_MODE_READ, d_events,
 				  ring_buffer_print_page_header,
 				  &ftrace_show_header_fops);
-	if (!entry)
-		pr_warn("Could not create tracefs 'header_page' entry\n");
 
-	entry = trace_create_file("header_event", TRACE_MODE_READ, d_events,
+	trace_create_file("header_event", TRACE_MODE_READ, d_events,
 				  ring_buffer_print_entry_header,
 				  &ftrace_show_header_fops);
-	if (!entry)
-		pr_warn("Could not create tracefs 'header_event' entry\n");
 
 	tr->event_dir = d_events;
 
Signature · 1 line
2.34.1