From: Tom Zanussi <tom.zanu...@linux.intel.com>

All var_refs are now handled uniformly and there's no reason to treat
the synth_refs in a special way now, so remove them and associated
functions.

Signed-off-by: Tom Zanussi <tom.zanu...@linux.intel.com>
---
 kernel/trace/trace_events_hist.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index da4800c3f745..81e998bb601e 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -279,8 +279,6 @@ struct hist_trigger_data {
        struct action_data              *actions[HIST_ACTIONS_MAX];
        unsigned int                    n_actions;
 
-       struct hist_field               *synth_var_refs[SYNTH_FIELDS_MAX];
-       unsigned int                    n_synth_var_refs;
        struct field_var                *field_vars[SYNTH_FIELDS_MAX];
        unsigned int                    n_field_vars;
        unsigned int                    n_field_var_str;
@@ -4005,20 +4003,6 @@ static void save_field_var(struct hist_trigger_data 
*hist_data,
 }
 
 
-static void destroy_synth_var_refs(struct hist_trigger_data *hist_data)
-{
-       unsigned int i;
-
-       for (i = 0; i < hist_data->n_synth_var_refs; i++)
-               destroy_hist_field(hist_data->synth_var_refs[i], 0);
-}
-
-static void save_synth_var_ref(struct hist_trigger_data *hist_data,
-                        struct hist_field *var_ref)
-{
-       hist_data->synth_var_refs[hist_data->n_synth_var_refs++] = var_ref;
-}
-
 static int check_synth_field(struct synth_event *event,
                             struct hist_field *hist_field,
                             unsigned int field_pos)
@@ -4187,7 +4171,6 @@ static int trace_action_create(struct hist_trigger_data 
*hist_data,
                                goto err;
                        }
 
-                       save_synth_var_ref(hist_data, var_ref);
                        field_pos++;
                        kfree(p);
                        continue;
@@ -5028,7 +5011,6 @@ static void destroy_hist_data(struct hist_trigger_data 
*hist_data)
        destroy_actions(hist_data);
        destroy_field_vars(hist_data);
        destroy_field_var_hists(hist_data);
-       destroy_synth_var_refs(hist_data);
 
        kfree(hist_data);
 }
-- 
2.14.1

Reply via email to