Skip to content

Commit

Permalink
mt76: usb: fix static tracepoints
Browse files Browse the repository at this point in the history
Add submit_urb and rx_urb static tracepoints in mt76-usb module.
Move trace_mac_txstat_fetch in mt76x02_mac_load_tx_status routine
in order to be available to usb drivers. Moreover remove
no longer used mt76x0/trace.{c,h}

Signed-off-by: Lorenzo Bianconi <[email protected]>
  • Loading branch information
LorenzoBianconi authored and nbd168 committed Oct 23, 2018
1 parent d033272 commit 1a2b2dc
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 347 deletions.
3 changes: 1 addition & 2 deletions mt76x0/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ obj-$(CONFIG_MT76x0E) += mt76x0e.o
obj-$(CONFIG_MT76x0_COMMON) += mt76x0-common.o

mt76x0-common-y := \
init.o main.o trace.o eeprom.o phy.o mac.o
init.o main.o eeprom.o phy.o mac.o

mt76x0u-y := usb.o usb_mcu.o
mt76x0e-y := pci.o pci_mcu.o

# ccflags-y := -DDEBUG
CFLAGS_trace.o := -I$(src)
1 change: 0 additions & 1 deletion mt76x0/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#include "mt76x0.h"
#include "eeprom.h"
#include "trace.h"
#include "mcu.h"
#include "initvals.h"

Expand Down
1 change: 0 additions & 1 deletion mt76x0/mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <linux/etherdevice.h>

#include "mt76x0.h"
#include "trace.h"

void mt76x0_mac_set_protection(struct mt76x02_dev *dev, bool legacy_prot,
int ht_mode)
Expand Down
8 changes: 3 additions & 5 deletions mt76x0/phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include "mt76x0.h"
#include "mcu.h"
#include "eeprom.h"
#include "trace.h"
#include "phy.h"
#include "initvals.h"
#include "initvals_phy.h"
Expand Down Expand Up @@ -54,7 +53,7 @@ mt76x0_rf_csr_wr(struct mt76x02_dev *dev, u32 offset, u8 value)
FIELD_PREP(MT_RF_CSR_CFG_REG_ID, reg) |
MT_RF_CSR_CFG_WR |
MT_RF_CSR_CFG_KICK);
trace_mt76x0_rf_write(&dev->mt76, bank, offset, value);

out:
mutex_unlock(&dev->phy_mutex);

Expand Down Expand Up @@ -95,10 +94,9 @@ static int mt76x0_rf_csr_rr(struct mt76x02_dev *dev, u32 offset)

val = mt76_rr(dev, MT_RF_CSR_CFG);
if (FIELD_GET(MT_RF_CSR_CFG_REG_ID, val) == reg &&
FIELD_GET(MT_RF_CSR_CFG_REG_BANK, val) == bank) {
FIELD_GET(MT_RF_CSR_CFG_REG_BANK, val) == bank)
ret = FIELD_GET(MT_RF_CSR_CFG_DATA, val);
trace_mt76x0_rf_read(&dev->mt76, bank, offset, ret);
}

out:
mutex_unlock(&dev->phy_mutex);

Expand Down
21 changes: 0 additions & 21 deletions mt76x0/trace.c

This file was deleted.

312 changes: 0 additions & 312 deletions mt76x0/trace.h

This file was deleted.

Loading

0 comments on commit 1a2b2dc

Please sign in to comment.