1 files changed, 9 insertions, 9 deletions
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index 5013812578b1..445700e51f6d 100644
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@ -115,7 +115,7 @@ int trace_selftest_startup_dynamic_tracing(struct tracer *trace,
        ftrace_set_filter(func_name, strlen(func_name), 1);
        /* enable tracing */
-        ret = trace->init(tr);
+        ret = tracer_init(trace, tr);
        if (ret) {
                warn_failed_init_tracer(trace, ret);
                goto out;
@@ -189,7 +189,7 @@ trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr)
        ftrace_enabled = 1;
        tracer_enabled = 1;
-        ret = trace->init(tr);
+        ret = tracer_init(trace, tr);
        if (ret) {
                warn_failed_init_tracer(trace, ret);
                goto out;
@@ -236,7 +236,7 @@ trace_selftest_startup_irqsoff(struct tracer *trace, struct trace_array *tr)
        int ret;
        /* start the tracing */
-        ret = trace->init(tr);
+        ret = tracer_init(trace, tr);
        if (ret) {
                warn_failed_init_tracer(trace, ret);
                return ret;
@@ -290,7 +290,7 @@ trace_selftest_startup_preemptoff(struct tracer *trace, struct trace_array *tr)
        }
        /* start the tracing */
-        ret = trace->init(tr);
+        ret = tracer_init(trace, tr);
        if (ret) {
                warn_failed_init_tracer(trace, ret);
                return ret;
@@ -344,7 +344,7 @@ trace_selftest_startup_preemptirqsoff(struct tracer *trace, struct trace_array *
        }
        /* start the tracing */
-        ret = trace->init(tr);
+        ret = tracer_init(trace, tr);
        if (ret) {
                warn_failed_init_tracer(trace, ret);
                goto out;
@@ -476,7 +476,7 @@ trace_selftest_startup_wakeup(struct tracer *trace, struct trace_array *tr)
        wait_for_completion(&isrt);
        /* start the tracing */
-        ret = trace->init(tr);
+        ret = tracer_init(trace, tr);
        if (ret) {
                warn_failed_init_tracer(trace, ret);
                return ret;
@@ -537,7 +537,7 @@ trace_selftest_startup_sched_switch(struct tracer *trace, struct trace_array *tr
        int ret;
        /* start the tracing */
-        ret = trace->init(tr);
+        ret = tracer_init(trace, tr);
        if (ret) {
                warn_failed_init_tracer(trace, ret);
                return ret;
@@ -569,7 +569,7 @@ trace_selftest_startup_sysprof(struct tracer *trace, struct trace_array *tr)
        int ret;
        /* start the tracing */
-        ret = trace->init(tr);
+        ret = tracer_init(trace, tr);
        if (ret) {
                warn_failed_init_tracer(trace, ret);
                return 0;
@@ -596,7 +596,7 @@ trace_selftest_startup_branch(struct tracer *trace, struct trace_array *tr)
        int ret;
        /* start the tracing */
-        ret = trace->init(tr);
+        ret = tracer_init(trace, tr);
        if (ret) {
                warn_failed_init_tracer(trace, ret);
                return ret;

diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index 5013812578b1..445700e51f6d 100644 --- a/kernel/trace/trace_selftest.c +++ b/kernel/trace/trace_selftest.c
@@ -115,7 +115,7 @@ int trace_selftest_startup_dynamic_tracing(struct tracer *trace,
115	ftrace_set_filter(func_name, strlen(func_name), 1);	115	ftrace_set_filter(func_name, strlen(func_name), 1);
116		116
117	/* enable tracing */	117	/* enable tracing */
118	ret = trace->init(tr);	118	ret = tracer_init(trace, tr);
119	if (ret) {	119	if (ret) {
120	warn_failed_init_tracer(trace, ret);	120	warn_failed_init_tracer(trace, ret);
121	goto out;	121	goto out;
@@ -189,7 +189,7 @@ trace_selftest_startup_function(struct tracer trace, struct trace_array tr)
189	ftrace_enabled = 1;	189	ftrace_enabled = 1;
190	tracer_enabled = 1;	190	tracer_enabled = 1;
191		191
192	ret = trace->init(tr);	192	ret = tracer_init(trace, tr);
193	if (ret) {	193	if (ret) {
194	warn_failed_init_tracer(trace, ret);	194	warn_failed_init_tracer(trace, ret);
195	goto out;	195	goto out;
@@ -236,7 +236,7 @@ trace_selftest_startup_irqsoff(struct tracer trace, struct trace_array tr)
236	int ret;	236	int ret;
237		237
238	/* start the tracing */	238	/* start the tracing */
239	ret = trace->init(tr);	239	ret = tracer_init(trace, tr);
240	if (ret) {	240	if (ret) {
241	warn_failed_init_tracer(trace, ret);	241	warn_failed_init_tracer(trace, ret);
242	return ret;	242	return ret;
@@ -290,7 +290,7 @@ trace_selftest_startup_preemptoff(struct tracer trace, struct trace_array tr)
290	}	290	}
291		291
292	/* start the tracing */	292	/* start the tracing */
293	ret = trace->init(tr);	293	ret = tracer_init(trace, tr);
294	if (ret) {	294	if (ret) {
295	warn_failed_init_tracer(trace, ret);	295	warn_failed_init_tracer(trace, ret);
296	return ret;	296	return ret;
@@ -344,7 +344,7 @@ trace_selftest_startup_preemptirqsoff(struct tracer trace, struct trace_array
344	}	344	}
345		345
346	/* start the tracing */	346	/* start the tracing */
347	ret = trace->init(tr);	347	ret = tracer_init(trace, tr);
348	if (ret) {	348	if (ret) {
349	warn_failed_init_tracer(trace, ret);	349	warn_failed_init_tracer(trace, ret);
350	goto out;	350	goto out;
@@ -476,7 +476,7 @@ trace_selftest_startup_wakeup(struct tracer trace, struct trace_array tr)
476	wait_for_completion(&isrt);	476	wait_for_completion(&isrt);
477		477
478	/* start the tracing */	478	/* start the tracing */
479	ret = trace->init(tr);	479	ret = tracer_init(trace, tr);
480	if (ret) {	480	if (ret) {
481	warn_failed_init_tracer(trace, ret);	481	warn_failed_init_tracer(trace, ret);
482	return ret;	482	return ret;
@@ -537,7 +537,7 @@ trace_selftest_startup_sched_switch(struct tracer trace, struct trace_array tr
537	int ret;	537	int ret;
538		538
539	/* start the tracing */	539	/* start the tracing */
540	ret = trace->init(tr);	540	ret = tracer_init(trace, tr);
541	if (ret) {	541	if (ret) {
542	warn_failed_init_tracer(trace, ret);	542	warn_failed_init_tracer(trace, ret);
543	return ret;	543	return ret;
@@ -569,7 +569,7 @@ trace_selftest_startup_sysprof(struct tracer trace, struct trace_array tr)
569	int ret;	569	int ret;
570		570
571	/* start the tracing */	571	/* start the tracing */
572	ret = trace->init(tr);	572	ret = tracer_init(trace, tr);
573	if (ret) {	573	if (ret) {
574	warn_failed_init_tracer(trace, ret);	574	warn_failed_init_tracer(trace, ret);
575	return 0;	575	return 0;
@@ -596,7 +596,7 @@ trace_selftest_startup_branch(struct tracer trace, struct trace_array tr)
596	int ret;	596	int ret;
597		597
598	/* start the tracing */	598	/* start the tracing */
599	ret = trace->init(tr);	599	ret = tracer_init(trace, tr);
600	if (ret) {	600	if (ret) {
601	warn_failed_init_tracer(trace, ret);	601	warn_failed_init_tracer(trace, ret);
602	return ret;	602	return ret;