perf tools: Remove warning()

Now everything uses pr_warning(), so ditch it.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-hv8r0mgdhk73wtfq3zrhavgx@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index 7fad885491c5710acb1e1d82e290d5a34639f88e..812a053d1941f0ad49d818371fa5aacbca4a3013 100644 (file)
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -1810,17 +1810,6 @@ static int test_pmu_events(void)
        return ret;
 }
 
-static void debug_warn(const char *warn, va_list params)
-{
-       char msg[1024];
-
-       if (verbose <= 0)
-               return;
-
-       vsnprintf(msg, sizeof(msg), warn, params);
-       fprintf(stderr, " Warning: %s\n", msg);
-}
-
 int test__parse_events(int subtest __maybe_unused)
 {
        int ret1, ret2 = 0;
@@ -1832,8 +1821,6 @@ do {                                                      \
                ret2 = ret1;                            \
 } while (0)
 
-       set_warning_routine(debug_warn);
-
        TEST_EVENTS(test__events);
 
        if (test_pmu())

diff --git a/tools/perf/util/usage.c b/tools/perf/util/usage.c
index aacb65e079aa870d34abd284da206e2669ba1a42..37225dc727380a07d040d7193c6017a05ff2d103 100644 (file)
--- a/tools/perf/util/usage.c
+++ b/tools/perf/util/usage.c
@@ -33,21 +33,10 @@ static void error_builtin(const char *err, va_list params)
        report(" Error: ", err, params);
 }
 
-static void warn_builtin(const char *warn, va_list params)
-{
-       report(" Warning: ", warn, params);
-}
-
 /* If we are in a dlopen()ed .so write to a global variable would segfault
  * (ugh), so keep things static. */
 static void (*usage_routine)(const char *err) __noreturn = usage_builtin;
 static void (*error_routine)(const char *err, va_list params) = error_builtin;
-static void (*warn_routine)(const char *err, va_list params) = warn_builtin;
-
-void set_warning_routine(void (*routine)(const char *err, va_list params))
-{
-       warn_routine = routine;
-}
 
 void usage(const char *err)
 {
@@ -72,12 +61,3 @@ int error(const char *err, ...)
        va_end(params);
        return -1;
 }
-
-void warning(const char *warn, ...)
-{
-       va_list params;
-
-       va_start(params, warn);
-       warn_routine(warn, params);
-       va_end(params);
-}

diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 978572dfeb14351494bf0a939e8ccada7b278f30..3927ab8df5ac94ba7fe9fe8c040a1153b83b5bce 100644 (file)
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -17,9 +17,6 @@
 void usage(const char *err) __noreturn;
 void die(const char *err, ...) __noreturn __printf(1, 2);
 int error(const char *err, ...) __printf(1, 2);
-void warning(const char *err, ...) __printf(1, 2);
-
-void set_warning_routine(void (*routine)(const char *err, va_list params));
 
 static inline void *zalloc(size_t size)
 {