2020-02-21 13:13:43

by Qiujun Huang

[permalink] [raw]
Subject: [PATCH] ftrace: Fix warning unused but set variables

Some dead code, no real bugs.

Signed-off-by: Qiujun Huang <[email protected]>
---
kernel/trace/ftrace.c | 6 ++----
kernel/trace/trace_events_hist.c | 3 +--
2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 3f7ee10..ae26d8a 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -4108,7 +4108,6 @@ static void process_mod_list(struct list_head *head, struct ftrace_ops *ops,
struct ftrace_hash **orig_hash, *new_hash;
LIST_HEAD(process_mods);
char *func;
- int ret;

mutex_lock(&ops->func_hash->regex_lock);

@@ -4161,7 +4160,7 @@ static void process_mod_list(struct list_head *head, struct ftrace_ops *ops,

mutex_lock(&ftrace_lock);

- ret = ftrace_hash_move_and_update_ops(ops, orig_hash,
+ ftrace_hash_move_and_update_ops(ops, orig_hash,
new_hash, enable);
mutex_unlock(&ftrace_lock);

@@ -5512,7 +5511,6 @@ int ftrace_regex_release(struct inode *inode, struct file *file)
struct ftrace_hash **orig_hash;
struct trace_parser *parser;
int filter_hash;
- int ret;

if (file->f_mode & FMODE_READ) {
iter = m->private;
@@ -5540,7 +5538,7 @@ int ftrace_regex_release(struct inode *inode, struct file *file)
orig_hash = &iter->ops->func_hash->notrace_hash;

mutex_lock(&ftrace_lock);
- ret = ftrace_hash_move_and_update_ops(iter->ops, orig_hash,
+ ftrace_hash_move_and_update_ops(iter->ops, orig_hash,
iter->hash, filter_hash);
mutex_unlock(&ftrace_lock);
} else {
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 483b3fd..29ce522 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -6549,12 +6549,11 @@ static void unregister_field_var_hists(struct hist_trigger_data *hist_data)
struct trace_event_file *file;
unsigned int i;
char *cmd;
- int ret;

for (i = 0; i < hist_data->n_field_var_hists; i++) {
file = hist_data->field_var_hists[i]->hist_data->event_file;
cmd = hist_data->field_var_hists[i]->cmd;
- ret = event_hist_trigger_func(&trigger_hist_cmd, file,
+ event_hist_trigger_func(&trigger_hist_cmd, file,
"!hist", "hist", cmd);
}
}
--
1.8.3.1