From b74180f517d4becbf86002b8f196618e4d59c492 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 5 Sep 2016 11:29:58 +0200 Subject: [PATCH] core: rename register trace events to avoid conflict with mt7601u Signed-off-by: Felix Fietkau --- mmio.c | 4 ++-- trace.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mmio.c b/mmio.c index c3731e21..09a14dea 100644 --- a/mmio.c +++ b/mmio.c @@ -22,14 +22,14 @@ static u32 mt76_mmio_rr(struct mt76_dev *dev, u32 offset) u32 val; val = ioread32(dev->regs + offset); - trace_reg_read(dev, offset, val); + trace_reg_rr(dev, offset, val); return val; } static void mt76_mmio_wr(struct mt76_dev *dev, u32 offset, u32 val) { - trace_reg_write(dev, offset, val); + trace_reg_wr(dev, offset, val); iowrite32(val, dev->regs + offset); } diff --git a/trace.h b/trace.h index cb4b354f..ea308959 100644 --- a/trace.h +++ b/trace.h @@ -51,12 +51,12 @@ DECLARE_EVENT_CLASS(dev_reg_evt, ) ); -DEFINE_EVENT(dev_reg_evt, reg_read, +DEFINE_EVENT(dev_reg_evt, reg_rr, TP_PROTO(struct mt76_dev *dev, u32 reg, u32 val), TP_ARGS(dev, reg, val) ); -DEFINE_EVENT(dev_reg_evt, reg_write, +DEFINE_EVENT(dev_reg_evt, reg_wr, TP_PROTO(struct mt76_dev *dev, u32 reg, u32 val), TP_ARGS(dev, reg, val) );