perf tools: Rename struct perf_data_file to perf_data

[linux-2.6-microblaze.git] / tools / perf / builtin-diff.c

diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 0cd4cf6..5292e3d 100644 (file)
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -47,7 +47,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 +707,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.path,
                        !d->idx ? "(Baseline)" : "");
 
        fprintf(stdout, "#\n");
@@ -776,16 +776,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.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.path);
                        goto out_delete;
                }
 
@@ -1286,11 +1286,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->path  = use_default ? defaults[i] : argv[i];
+               data->mode  = PERF_DATA_MODE_READ,
+               data->force = force,
 
                d->idx  = i;
        }