trace: cma: remove unnecessary event class cma_alloc_class

After commit cb6c33d4dc09 ("cma: tracing: print alloc result in
trace_cma_alloc_finish"), cma_alloc_class has only one event which is
cma_alloc_busy_retry.  So we can remove the cma_alloc_class.

Link: https://lkml.kernel.org/r/20230323114136.177677-1-haowenchao2@huawei.com
Signed-off-by: Wenchao Hao <haowenchao2@huawei.com>
Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Cc: Feilong Lin <linfeilong@huawei.com>
Cc: Hongxiang Lou <louhongxiang@huawei.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/trace/events/cma.h b/include/trace/events/cma.h
index ef75ea606ab261411e8332edb0369661c81dab05..25103e67737cbc1c8e0ea2b170a608358dba186e 100644 (file)
--- a/include/trace/events/cma.h
+++ b/include/trace/events/cma.h
@@ -8,37 +8,6 @@
 #include <linux/types.h>
 #include <linux/tracepoint.h>
 
-DECLARE_EVENT_CLASS(cma_alloc_class,
-
-       TP_PROTO(const char *name, unsigned long pfn, const struct page *page,
-                unsigned long count, unsigned int align),
-
-       TP_ARGS(name, pfn, page, count, align),
-
-       TP_STRUCT__entry(
-               __string(name, name)
-               __field(unsigned long, pfn)
-               __field(const struct page *, page)
-               __field(unsigned long, count)
-               __field(unsigned int, align)
-       ),
-
-       TP_fast_assign(
-               __assign_str(name, name);
-               __entry->pfn = pfn;
-               __entry->page = page;
-               __entry->count = count;
-               __entry->align = align;
-       ),
-
-       TP_printk("name=%s pfn=0x%lx page=%p count=%lu align=%u",
-                 __get_str(name),
-                 __entry->pfn,
-                 __entry->page,
-                 __entry->count,
-                 __entry->align)
-);
-
 TRACE_EVENT(cma_release,
 
        TP_PROTO(const char *name, unsigned long pfn, const struct page *page,
@@ -125,12 +94,35 @@ TRACE_EVENT(cma_alloc_finish,
                  __entry->errorno)
 );
 
-DEFINE_EVENT(cma_alloc_class, cma_alloc_busy_retry,
+TRACE_EVENT(cma_alloc_busy_retry,
 
        TP_PROTO(const char *name, unsigned long pfn, const struct page *page,
                 unsigned long count, unsigned int align),
 
-       TP_ARGS(name, pfn, page, count, align)
+       TP_ARGS(name, pfn, page, count, align),
+
+       TP_STRUCT__entry(
+               __string(name, name)
+               __field(unsigned long, pfn)
+               __field(const struct page *, page)
+               __field(unsigned long, count)
+               __field(unsigned int, align)
+       ),
+
+       TP_fast_assign(
+               __assign_str(name, name);
+               __entry->pfn = pfn;
+               __entry->page = page;
+               __entry->count = count;
+               __entry->align = align;
+       ),
+
+       TP_printk("name=%s pfn=0x%lx page=%p count=%lu align=%u",
+                 __get_str(name),
+                 __entry->pfn,
+                 __entry->page,
+                 __entry->count,
+                 __entry->align)
 );
 
 #endif /* _TRACE_CMA_H */