2 files changed, 5 insertions, 7 deletions

diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index ef671cd41bb3..3cbd10496087 100644
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -441,9 +441,8 @@ static int test__checkevent_pmu_name(struct perf_evlist *evlist)
 
 static int test__checkevent_pmu_events(struct perf_evlist *evlist)
 {
-        struct perf_evsel *evsel;
+        struct perf_evsel *evsel = perf_evlist__first(evlist);
 
-        evsel = list_entry(evlist->entries.next, struct perf_evsel, node);
         TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);
         TEST_ASSERT_VAL("wrong type", PERF_TYPE_RAW == evsel->attr.type);
         TEST_ASSERT_VAL("wrong exclude_user",
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 16848bb4c418..089fd3713783 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1847,13 +1847,13 @@ browse_hists:
                         switch (key) {
                         case K_TAB:
                                 if (pos->node.next == &evlist->entries)
-                                        pos = list_entry(evlist->entries.next, struct perf_evsel, node);
+                                        pos = perf_evlist__first(evlist);
                                 else
-                                        pos = list_entry(pos->node.next, struct perf_evsel, node);
+                                        pos = perf_evsel__next(pos);
                                 goto browse_hists;
                         case K_UNTAB:
                                 if (pos->node.prev == &evlist->entries)
-                                        pos = list_entry(evlist->entries.prev, struct perf_evsel, node);
+                                        pos = perf_evlist__last(evlist);
                                 else
                                         pos = list_entry(pos->node.prev, struct perf_evsel, node);
                                 goto browse_hists;
@@ -1943,8 +1943,7 @@ int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help,
 
 single_entry:
         if (nr_entries == 1) {
-                struct perf_evsel *first = list_entry(evlist->entries.next,
-                                                      struct perf_evsel, node);
+                struct perf_evsel *first = perf_evlist__first(evlist);
                 const char *ev_name = perf_evsel__name(first);
 
                 return perf_evsel__hists_browse(first, nr_entries, help,