Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e4e0a9d authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Change (symbol|annotation)__calc_percent return type to void 



There's no need for symbol__calc_percent and annotation__calc_percent
functions to return any value, since it's always zero. Changing both
function to return void.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-z0gs28hh24m4gia1t1ctraye@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a7eec4c6

tools/perf/util/annotate.c

+8 −9
Original line number Diff line number Diff line
@@ -1584,7 +1584,7 @@ static void calc_percent(struct sym_hist *hist, 
	}

}



static int annotation__calc_percent(struct annotation *notes,

static void annotation__calc_percent(struct annotation *notes,

				     struct perf_evsel *evsel, s64 len)

{

	struct annotation_line *al, *next;
@@ -1609,15 +1609,13 @@ static int annotation__calc_percent(struct annotation *notes, 
			calc_percent(hist, sample, al->offset, end);

		}

	}



	return 0;

}



int symbol__calc_percent(struct symbol *sym, struct perf_evsel *evsel)

void symbol__calc_percent(struct symbol *sym, struct perf_evsel *evsel)

{

	struct annotation *notes = symbol__annotation(sym);



	return annotation__calc_percent(notes, evsel, symbol__size(sym));

	annotation__calc_percent(notes, evsel, symbol__size(sym));

}



int symbol__annotate(struct symbol *sym, struct map *map,
@@ -1656,10 +1654,11 @@ int symbol__annotate(struct symbol *sym, struct map *map, 
	}



	err = symbol__disassemble(sym, &args);

	if (err)

	if (!err)

		symbol__calc_percent(sym, evsel);



	return err;



	return symbol__calc_percent(sym, evsel);

}



static void insert_source_line(struct rb_root *root, struct annotation_line *al)

tools/perf/util/annotate.h

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ struct annotation_line * 
annotation_line__next(struct annotation_line *pos, struct list_head *head);

int disasm_line__scnprintf(struct disasm_line *dl, char *bf, size_t size, bool raw);

size_t disasm__fprintf(struct list_head *head, FILE *fp);

int symbol__calc_percent(struct symbol *sym, struct perf_evsel *evsel);

void symbol__calc_percent(struct symbol *sym, struct perf_evsel *evsel);



struct sym_hist {

	u64		      nr_samples;