tracing: Remove unnecessary "goto out" that simply returns ret is trigger code

There's several functions that have "goto out;" where the label out is just:

 out:
	return ret;

Simplify the code by just doing the return in the location and removing
all the out labels and jumps.

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Tom Zanussi <zanussi@kernel.org>
Link: https://lore.kernel.org/20250507145456.121186494@goodmis.org
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
index c316badc608b391ee192c6d8f27f123207ffaf3c..fdd1112388e9aed7b495d6a981f2805dd108a35c 100644 (file)
--- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c
@@ -552,16 +552,14 @@ static int register_trigger(char *glob,
        lockdep_assert_held(&event_mutex);
 
        list_for_each_entry(test, &file->triggers, list) {
-               if (test->cmd_ops->trigger_type == data->cmd_ops->trigger_type) {
-                       ret = -EEXIST;
-                       goto out;
-               }
+               if (test->cmd_ops->trigger_type == data->cmd_ops->trigger_type)
+                       return -EEXIST;
        }
 
        if (data->ops->init) {
                ret = data->ops->init(data);
                if (ret < 0)
-                       goto out;
+                       return ret;
        }
 
        list_add_rcu(&data->list, &file->triggers);
@@ -572,7 +570,6 @@ static int register_trigger(char *glob,
                list_del_rcu(&data->list);
                update_cond_flag(file);
        }
-out:
        return ret;
 }
 
@@ -770,7 +767,7 @@ int event_trigger_separate_filter(char *param_and_filter, char **param,
        if (!param_and_filter) {
                if (param_required)
                        ret = -EINVAL;
-               goto out;
+               return ret;
        }
 
        /*
@@ -781,7 +778,7 @@ int event_trigger_separate_filter(char *param_and_filter, char **param,
         */
        if (!param_required && param_and_filter && !isdigit(param_and_filter[0])) {
                *filter = param_and_filter;
-               goto out;
+               return ret;
        }
 
        /*
@@ -799,7 +796,6 @@ int event_trigger_separate_filter(char *param_and_filter, char **param,
                if (!**filter)
                        *filter = NULL;
        }
-out:
        return ret;
 }
 
@@ -991,13 +987,12 @@ event_trigger_parse(struct event_command *cmd_ops,
        ret = -ENOMEM;
        trigger_data = trigger_data_alloc(cmd_ops, cmd, param, file);
        if (!trigger_data)
-               goto out;
+               return ret;
 
        if (remove) {
                event_trigger_unregister(cmd_ops, file, glob+1, trigger_data);
                trigger_data_free(trigger_data);
-               ret = 0;
-               goto out;
+               return 0;
        }
 
        ret = event_trigger_parse_num(param, trigger_data);
@@ -1017,13 +1012,12 @@ event_trigger_parse(struct event_command *cmd_ops,
 
        /* Down the counter of trigger_data or free it if not used anymore */
        event_trigger_free(trigger_data);
- out:
        return ret;
 
  out_free:
        event_trigger_reset_filter(cmd_ops, trigger_data);
        trigger_data_free(trigger_data);
-       goto out;
+       return ret;
 }
 
 /**
@@ -1057,10 +1051,10 @@ int set_trigger_filter(char *filter_str,
        s = strsep(&filter_str, " \t");
 
        if (!strlen(s) || strcmp(s, "if") != 0)
-               goto out;
+               return ret;
 
        if (!filter_str)
-               goto out;
+               return ret;
 
        /* The filter is for the 'trigger' event, not the triggered event */
        ret = create_event_filter(file->tr, file->event_call,
@@ -1104,7 +1098,6 @@ int set_trigger_filter(char *filter_str,
                        ret = -ENOMEM;
                }
        }
- out:
        return ret;
 }
 
@@ -1772,7 +1765,7 @@ int event_enable_trigger_parse(struct event_command *cmd_ops,
        ret = -EINVAL;
        event_enable_file = find_event_file(tr, system, event);
        if (!event_enable_file)
-               goto out;
+               return ret;
 
 #ifdef CONFIG_HIST_TRIGGERS
        hist = ((strcmp(cmd, ENABLE_HIST_STR) == 0) ||
@@ -1787,7 +1780,7 @@ int event_enable_trigger_parse(struct event_command *cmd_ops,
 
        enable_data = kzalloc(sizeof(*enable_data), GFP_KERNEL);
        if (!enable_data)
-               goto out;
+               return ret;
 
        enable_data->hist = hist;
        enable_data->enable = enable;
@@ -1796,7 +1789,7 @@ int event_enable_trigger_parse(struct event_command *cmd_ops,
        trigger_data = trigger_data_alloc(cmd_ops, cmd, param, enable_data);
        if (!trigger_data) {
                kfree(enable_data);
-               goto out;
+               return ret;
        }
 
        if (remove) {
@@ -1804,7 +1797,7 @@ int event_enable_trigger_parse(struct event_command *cmd_ops,
                kfree(trigger_data);
                kfree(enable_data);
                ret = 0;
-               goto out;
+               return ret;
        }
 
        /* Up the trigger_data count to make sure nothing frees it on failure */
@@ -1834,7 +1827,6 @@ int event_enable_trigger_parse(struct event_command *cmd_ops,
                goto out_disable;
 
        event_trigger_free(trigger_data);
- out:
        return ret;
  out_disable:
        trace_event_enable_disable(event_enable_file, 0, 1);
@@ -1845,7 +1837,7 @@ int event_enable_trigger_parse(struct event_command *cmd_ops,
        event_trigger_free(trigger_data);
        kfree(enable_data);
 
-       goto out;
+       return ret;
 }
 
 int event_enable_register_trigger(char *glob,
@@ -1865,15 +1857,14 @@ int event_enable_register_trigger(char *glob,
                    (test->cmd_ops->trigger_type ==
                     data->cmd_ops->trigger_type) &&
                    (test_enable_data->file == enable_data->file)) {
-                       ret = -EEXIST;
-                       goto out;
+                       return -EEXIST;
                }
        }
 
        if (data->ops->init) {
                ret = data->ops->init(data);
                if (ret < 0)
-                       goto out;
+                       return ret;
        }
 
        list_add_rcu(&data->list, &file->triggers);
@@ -1884,7 +1875,6 @@ int event_enable_register_trigger(char *glob,
                list_del_rcu(&data->list);
                update_cond_flag(file);
        }
-out:
        return ret;
 }