1 files changed, 8 insertions, 30 deletions

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 1532ebde6c4b..ee93c18a6685 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -1375,36 +1375,13 @@ repeat:
         if (symbol__init(&session->header.env) < 0)
                 goto error;
 
-        report.ptime_range = perf_time__range_alloc(report.time_str,
-                                                    &report.range_size);
-        if (!report.ptime_range) {
-                ret = -ENOMEM;
-                goto error;
-        }
-
-        if (perf_time__parse_str(report.ptime_range, report.time_str) != 0) {
-                if (session->evlist->first_sample_time == 0 &&
-                    session->evlist->last_sample_time == 0) {
-                        pr_err("HINT: no first/last sample time found in perf data.\n"
-                               "Please use latest perf binary to execute 'perf record'\n"
-                               "(if '--buildid-all' is enabled, please set '--timestamp-boundary').\n");
-                        ret = -EINVAL;
-                        goto error;
-                }
-
-                report.range_num = perf_time__percent_parse_str(
-                                        report.ptime_range, report.range_size,
-                                        report.time_str,
-                                        session->evlist->first_sample_time,
-                                        session->evlist->last_sample_time);
-
-                if (report.range_num < 0) {
-                        pr_err("Invalid time string\n");
-                        ret = -EINVAL;
+        if (report.time_str) {
+                ret = perf_time__parse_for_ranges(report.time_str, session,
+                                                  &report.ptime_range,
+                                                  &report.range_size,
+                                                  &report.range_num);
+                if (ret < 0)
                         goto error;
-                }
-        } else {
-                report.range_num = 1;
         }
 
         if (session->tevent.pevent &&
@@ -1426,7 +1403,8 @@ repeat:
                 ret = 0;
 
 error:
-        zfree(&report.ptime_range);
+        if (report.ptime_range)
+                zfree(&report.ptime_range);
 
         perf_session__delete(session);
         return ret;