int nfds = 0;
        struct perf_evsel *evsel;
 
-       list_for_each_entry(evsel, &evlist->entries, node) {
+       evlist__for_each(evlist, evsel) {
                if (evsel->system_wide)
                        nfds += nr_cpus;
                else
 
        max_nr = (UINT16_MAX - sizeof(struct id_index_event)) /
                 sizeof(struct id_index_entry);
 
-       list_for_each_entry(evsel, &evlist->entries, node)
+       evlist__for_each(evlist, evsel)
                nr += evsel->ids;
 
        n = nr > max_nr ? max_nr : nr;
        ev->id_index.header.size = sz;
        ev->id_index.nr = n;
 
-       list_for_each_entry(evsel, &evlist->entries, node) {
+       evlist__for_each(evlist, evsel) {
                u32 j;
 
                for (j = 0; j < evsel->ids; j++) {