diff options
| author | Steven Rostedt <rostedt@goodmis.org> | 2026-06-29 11:32:48 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2026-06-29 11:32:48 -0400 |
| commit | 0e372d9db612ba8d30483565b90b3a6a7846da2f (patch) | |
| tree | 80ca12da380c1c74731dbc4f4267f9c297ff118c /drivers | |
| parent | a13905ac604cfd28fbda0815da16127bd4069bbe (diff) | |
| parent | 9581123304b23049437324038698af9fb56ee663 (diff) | |
| download | linux-next-0e372d9db612ba8d30483565b90b3a6a7846da2f.tar.gz linux-next-0e372d9db612ba8d30483565b90b3a6a7846da2f.zip | |
Merge trace/for-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpufreq/amd-pstate.c | 3 | ||||
| -rw-r--r-- | drivers/hid/intel-ish-hid/ipc/pci-ish.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c index 3a80acee9a7c..a74a4cf99d22 100644 --- a/drivers/cpufreq/amd-pstate.c +++ b/drivers/cpufreq/amd-pstate.c @@ -361,7 +361,8 @@ static int amd_pstate_set_floor_perf(struct cpufreq_policy *policy, u8 perf) out_trace: if (trace_amd_pstate_cppc_req2_enabled()) - trace_amd_pstate_cppc_req2(cpudata->cpu, perf, changed, ret); + trace_call__amd_pstate_cppc_req2(cpudata->cpu, perf, changed, + ret); return ret; } diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c index ed3405c05e73..8d36ae96a3ee 100644 --- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c +++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c @@ -110,7 +110,7 @@ void ish_event_tracer(struct ishtp_device *dev, const char *format, ...) vsnprintf(tmp_buf, sizeof(tmp_buf), format, args); va_end(args); - trace_ishtp_dump(tmp_buf); + trace_call__ishtp_dump(tmp_buf); } } |