Since commit 90ea1c6436d2 ('random: remove the blocking pool')
trace_extract_entropy_user() is unused.

As the result, trace_extract_entropy() is the only trace
function needed, thus there's no need for a separate event
class / event.

Cc: Andy Lutomirski <[email protected]>
Cc: Theodore Ts'o <[email protected]>
Signed-off-by: Yann Droneaud <[email protected]>
---
 include/trace/events/random.h | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/include/trace/events/random.h b/include/trace/events/random.h
index d5aa662294fe..c2256250e3ef 100644
--- a/include/trace/events/random.h
+++ b/include/trace/events/random.h
@@ -198,7 +198,7 @@ DEFINE_EVENT(random__get_random_bytes, 
get_random_bytes_arch,
        TP_ARGS(nbytes, IP)
 );
 
-DECLARE_EVENT_CLASS(random__extract_entropy,
+TRACE_EVENT(extract_entropy,
        TP_PROTO(const char *pool_name, int nbytes, int entropy_count,
                 unsigned long IP),
 
@@ -223,21 +223,6 @@ DECLARE_EVENT_CLASS(random__extract_entropy,
                  (void *)__entry->IP)
 );
 
-
-DEFINE_EVENT(random__extract_entropy, extract_entropy,
-       TP_PROTO(const char *pool_name, int nbytes, int entropy_count,
-                unsigned long IP),
-
-       TP_ARGS(pool_name, nbytes, entropy_count, IP)
-);
-
-DEFINE_EVENT(random__extract_entropy, extract_entropy_user,
-       TP_PROTO(const char *pool_name, int nbytes, int entropy_count,
-                unsigned long IP),
-
-       TP_ARGS(pool_name, nbytes, entropy_count, IP)
-);
-
 TRACE_EVENT(urandom_read,
        TP_PROTO(int got_bits, int pool_left, int input_left),
 
-- 
2.25.4

Reply via email to