1 files changed, 12 insertions, 15 deletions

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 28f8aab73aee..3eff17f703f3 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -386,9 +386,8 @@ static void annotate_browser__init_asm_mode(struct annotate_browser *browser)
         browser->b.nr_entries = browser->nr_asm_entries;
 }
 
-static bool annotate_browser__callq(struct annotate_browser *browser,
-                                    int evidx, void (*timer)(void *arg),
-                                    void *arg, int delay_secs)
+static bool annotate_browser__callq(struct annotate_browser *browser, int evidx,
+                                    struct hist_browser_timer *hbt)
 {
         struct map_symbol *ms = browser->b.priv;
         struct disasm_line *dl = browser->selection;
@@ -418,7 +417,7 @@ static bool annotate_browser__callq(struct annotate_browser *browser,
         }
 
         pthread_mutex_unlock(&notes->lock);
-        symbol__tui_annotate(target, ms->map, evidx, timer, arg, delay_secs);
+        symbol__tui_annotate(target, ms->map, evidx, hbt);
         ui_browser__show_title(&browser->b, sym->name);
         return true;
 }
@@ -602,13 +601,13 @@ static void annotate_browser__update_addr_width(struct annotate_browser *browser
 }
 
 static int annotate_browser__run(struct annotate_browser *browser, int evidx,
-                                 void(*timer)(void *arg),
-                                 void *arg, int delay_secs)
+                                 struct hist_browser_timer *hbt)
 {
         struct rb_node *nd = NULL;
         struct map_symbol *ms = browser->b.priv;
         struct symbol *sym = ms->sym;
         const char *help = "Press 'h' for help on key bindings";
+        int delay_secs = hbt ? hbt->refresh : 0;
         int key;
 
         if (ui_browser__show(&browser->b, sym->name, help) < 0)
@@ -639,8 +638,8 @@ static int annotate_browser__run(struct annotate_browser *browser, int evidx,
 
                 switch (key) {
                 case K_TIMER:
-                        if (timer != NULL)
-                                timer(arg);
+                        if (hbt)
+                                hbt->timer(hbt->arg);
 
                         if (delay_secs != 0)
                                 symbol__annotate_decay_histogram(sym, evidx);
@@ -740,7 +739,7 @@ show_help:
                                         goto show_sup_ins;
                                 goto out;
                         } else if (!(annotate_browser__jump(browser) ||
-                                     annotate_browser__callq(browser, evidx, timer, arg, delay_secs))) {
+                                     annotate_browser__callq(browser, evidx, hbt))) {
 show_sup_ins:
                                 ui_helpline__puts("Actions are only available for 'callq', 'retq' & jump instructions.");
                         }
@@ -763,10 +762,9 @@ out:
 }
 
 int hist_entry__tui_annotate(struct hist_entry *he, int evidx,
-                             void(*timer)(void *arg), void *arg, int delay_secs)
+                             struct hist_browser_timer *hbt)
 {
-        return symbol__tui_annotate(he->ms.sym, he->ms.map, evidx,
-                                    timer, arg, delay_secs);
+        return symbol__tui_annotate(he->ms.sym, he->ms.map, evidx, hbt);
 }
 
 static void annotate_browser__mark_jump_targets(struct annotate_browser *browser,
@@ -816,8 +814,7 @@ static inline int width_jumps(int n)
 }
 
 int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
-                         void(*timer)(void *arg), void *arg,
-                         int delay_secs)
+                         struct hist_browser_timer *hbt)
 {
         struct disasm_line *pos, *n;
         struct annotation *notes;
@@ -899,7 +896,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
 
         annotate_browser__update_addr_width(&browser);
 
-        ret = annotate_browser__run(&browser, evidx, timer, arg, delay_secs);
+        ret = annotate_browser__run(&browser, evidx, hbt);
         list_for_each_entry_safe(pos, n, &notes->src->source, node) {
                 list_del(&pos->node);
                 disasm_line__free(pos);