perf tools: Rename struct perf_data_file to perf_data

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

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index f9dff65..0dc3237 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -257,7 +257,7 @@ static int report__setup_sample_type(struct report *rep)
 {
        struct perf_session *session = rep->session;
        u64 sample_type = perf_evlist__combined_sample_type(session->evlist);
-       bool is_pipe = perf_data_file__is_pipe(session->file);
+       bool is_pipe = perf_data__is_pipe(session->data);
 
        if (session->itrace_synth_opts->callchain ||
            (!is_pipe &&
@@ -568,7 +568,7 @@ static int __cmd_report(struct report *rep)
        int ret;
        struct perf_session *session = rep->session;
        struct perf_evsel *pos;
-       struct perf_data_file *file = session->file;
+       struct perf_data *data = session->data;
 
        signal(SIGINT, sig_handler);
 
@@ -637,7 +637,7 @@ static int __cmd_report(struct report *rep)
                rep->nr_entries += evsel__hists(pos)->nr_entries;
 
        if (rep->nr_entries == 0) {
-               ui__error("The %s file has no samples!\n", file->path);
+               ui__error("The %s file has no samples!\n", data->path);
                return 0;
        }
 
@@ -879,7 +879,7 @@ int cmd_report(int argc, const char **argv)
                    "Show inline function"),
        OPT_END()
        };
-       struct perf_data_file file = {
+       struct perf_data data = {
                .mode  = PERF_DATA_MODE_READ,
        };
        int ret = hists__init();
@@ -940,11 +940,11 @@ int cmd_report(int argc, const char **argv)
                        input_name = "perf.data";
        }
 
-       file.path  = input_name;
-       file.force = symbol_conf.force;
+       data.path  = input_name;
+       data.force = symbol_conf.force;
 
 repeat:
-       session = perf_session__new(&file, false, &report.tool);
+       session = perf_session__new(&data, false, &report.tool);
        if (session == NULL)
                return -1;