Commit 0d52b788 authored by Kajol Jain's avatar Kajol Jain Committed by Arnaldo Carvalho de Melo
Browse files

perf jevents: Make json_events() static and ditch jevents.h file 



This patch removes jevents.h and makes json_events function static.

Signed-off-by: default avatarKajol Jain <kjain@linux.ibm.com>
Reviewed-by: default avatarJohn Garry <john.garry@huawei.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Link: http://lore.kernel.org/lkml/20200907064133.75090-2-kjain@linux.ibm.com


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

tools/perf/pmu-events/jevents.c

+1 −2
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
#include <linux/list.h>

#include "jsmn.h"

#include "json.h"

#include "jevents.h"



int verbose;

char *prog;
@@ -513,7 +512,7 @@ try_fixup(const char *fn, char *arch_std, char **event, char **desc, 
}



/* Call func with each event in the json file */

int json_events(const char *fn,

static int json_events(const char *fn,

	  int (*func)(void *data, char *name, char *event, char *desc,

		      char *long_desc,

		      char *pmu, char *unit, char *perpkg,

tools/perf/pmu-events/jevents.h

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef JEVENTS_H

#define JEVENTS_H 1



int json_events(const char *fn,

		int (*func)(void *data, char *name, char *event, char *desc,

				char *long_desc,

				char *pmu,

				char *unit, char *perpkg, char *metric_expr,

				char *metric_name, char *metric_group,

				char *deprecated, char *metric_constraint),

		void *data);

char *get_cpu_str(void);



#ifndef min

#define min(x, y) ({                            \

	typeof(x) _min1 = (x);                  \

	typeof(y) _min2 = (y);                  \

	(void) (&_min1 == &_min2);              \

	_min1 < _min2 ? _min1 : _min2; })

#endif



#endif