OSDN Git Service

net/mediatek: disambiguate mt76 vs mt7601u trace events
authorAlexei Starovoitov <ast@kernel.org>
Wed, 28 Mar 2018 19:05:33 +0000 (12:05 -0700)
committerDaniel Borkmann <daniel@iogearbox.net>
Wed, 28 Mar 2018 20:55:18 +0000 (22:55 +0200)
two trace events defined with the same name and both unused.
They conflict in allyesconfig build. Rename one of them.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
drivers/net/wireless/mediatek/mt7601u/trace.h

index 2898973..82c8898 100644 (file)
@@ -34,7 +34,7 @@
 #define REG_PR_FMT     "%04x=%08x"
 #define REG_PR_ARG     __entry->reg, __entry->val
 
-DECLARE_EVENT_CLASS(dev_reg_evt,
+DECLARE_EVENT_CLASS(dev_reg_evtu,
        TP_PROTO(struct mt7601u_dev *dev, u32 reg, u32 val),
        TP_ARGS(dev, reg, val),
        TP_STRUCT__entry(
@@ -51,12 +51,12 @@ DECLARE_EVENT_CLASS(dev_reg_evt,
        )
 );
 
-DEFINE_EVENT(dev_reg_evt, reg_read,
+DEFINE_EVENT(dev_reg_evtu, reg_read,
        TP_PROTO(struct mt7601u_dev *dev, u32 reg, u32 val),
        TP_ARGS(dev, reg, val)
 );
 
-DEFINE_EVENT(dev_reg_evt, reg_write,
+DEFINE_EVENT(dev_reg_evtu, reg_write,
        TP_PROTO(struct mt7601u_dev *dev, u32 reg, u32 val),
        TP_ARGS(dev, reg, val)
 );