1 files changed, 10 insertions, 9 deletions

diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 0cd4cf6a344b..d660cb7b222b 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * builtin-diff.c
  *
@@ -47,7 +48,7 @@ struct diff_hpp_fmt {
 
 struct data__file {
         struct perf_session     *session;
-        struct perf_data_file   file;
+        struct perf_data         data;
         int                      idx;
         struct hists            *hists;
         struct diff_hpp_fmt      fmt[PERF_HPP_DIFF__MAX_INDEX];
@@ -707,7 +708,7 @@ static void data__fprintf(void)
 
         data__for_each_file(i, d)
                 fprintf(stdout, "#  [%d] %s %s\n",
-                        d->idx, d->file.path,
+                        d->idx, d->data.file.path,
                         !d->idx ? "(Baseline)" : "");
 
         fprintf(stdout, "#\n");
@@ -776,16 +777,16 @@ static int __cmd_diff(void)
         int ret = -EINVAL, i;
 
         data__for_each_file(i, d) {
-                d->session = perf_session__new(&d->file, false, &tool);
+                d->session = perf_session__new(&d->data, false, &tool);
                 if (!d->session) {
-                        pr_err("Failed to open %s\n", d->file.path);
+                        pr_err("Failed to open %s\n", d->data.file.path);
                         ret = -1;
                         goto out_delete;
                 }
 
                 ret = perf_session__process_events(d->session);
                 if (ret) {
-                        pr_err("Failed to process %s\n", d->file.path);
+                        pr_err("Failed to process %s\n", d->data.file.path);
                         goto out_delete;
                 }
 
@@ -1286,11 +1287,11 @@ static int data_init(int argc, const char **argv)
                 return -ENOMEM;
 
         data__for_each_file(i, d) {
-                struct perf_data_file *file = &d->file;
+                struct perf_data *data = &d->data;
 
-                file->path  = use_default ? defaults[i] : argv[i];
-                file->mode  = PERF_DATA_MODE_READ,
-                file->force = force,
+                data->file.path = use_default ? defaults[i] : argv[i];
+                data->mode      = PERF_DATA_MODE_READ,
+                data->force     = force,
 
                 d->idx  = i;
         }