diff options
| author | Alexei Starovoitov | 2018-03-28 21:05:33 +0200 |
|---|---|---|
| committer | Daniel Borkmann | 2018-03-28 22:55:18 +0200 |
| commit | d992ee6c1ec3c9949d87877bdb44faa7f9cc60ce (patch) | |
| tree | 143657fe279ada50704dfc6054c797819dfb5ada | |
| parent | treewide: remove large struct-pass-by-value from tracepoint arguments (diff) | |
| download | kernel-qcow2-linux-d992ee6c1ec3c9949d87877bdb44faa7f9cc60ce.tar.gz kernel-qcow2-linux-d992ee6c1ec3c9949d87877bdb44faa7f9cc60ce.tar.xz kernel-qcow2-linux-d992ee6c1ec3c9949d87877bdb44faa7f9cc60ce.zip | |
net/mediatek: disambiguate mt76 vs mt7601u trace events
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>
| -rw-r--r-- | drivers/net/wireless/mediatek/mt7601u/trace.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/mediatek/mt7601u/trace.h b/drivers/net/wireless/mediatek/mt7601u/trace.h index 289897300ef0..82c8898b9076 100644 --- a/drivers/net/wireless/mediatek/mt7601u/trace.h +++ b/drivers/net/wireless/mediatek/mt7601u/trace.h @@ -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) ); |