Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 230fc4f3 authored by Bruno Randolf's avatar Bruno Randolf Committed by John W. Linville
Browse files

ath5k: remove ATH_TRACE macro 



Now that we have ftrace, it is not needed any more.

Signed-off-by: default avatarBruno Randolf <br1@einfach.org>
Acked-by: default avatarNick Kossifidis <mickflemm@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent afe86286

drivers/net/wireless/ath/ath5k/attach.c

+0 −2
Original line number Diff line number Diff line
@@ -351,8 +351,6 @@ err_free: 
 */

void ath5k_hw_detach(struct ath5k_hw *ah)

{

	ATH5K_TRACE(ah->ah_sc);



	__set_bit(ATH_STAT_INVALID, ah->ah_sc->status);



	if (ah->ah_rf_banks != NULL)

drivers/net/wireless/ath/ath5k/caps.c

+0 −7
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ int ath5k_hw_set_capabilities(struct ath5k_hw *ah) 
{

	u16 ee_header;



	ATH5K_TRACE(ah->ah_sc);

	/* Capabilities stored in the EEPROM */

	ee_header = ah->ah_capabilities.cap_eeprom.ee_header;
@@ -123,8 +122,6 @@ int ath5k_hw_get_capability(struct ath5k_hw *ah, 
		enum ath5k_capability_type cap_type,

		u32 capability, u32 *result)

{

	ATH5K_TRACE(ah->ah_sc);



	switch (cap_type) {

	case AR5K_CAP_NUM_TXQUEUES:

		if (result) {
@@ -173,8 +170,6 @@ yes: 
int ath5k_hw_enable_pspoll(struct ath5k_hw *ah, u8 *bssid,

		u16 assoc_id)

{

	ATH5K_TRACE(ah->ah_sc);



	if (ah->ah_version == AR5K_AR5210) {

		AR5K_REG_DISABLE_BITS(ah, AR5K_STA_ID1,

			AR5K_STA_ID1_NO_PSPOLL | AR5K_STA_ID1_DEFAULT_ANTENNA);
@@ -186,8 +181,6 @@ int ath5k_hw_enable_pspoll(struct ath5k_hw *ah, u8 *bssid, 


int ath5k_hw_disable_pspoll(struct ath5k_hw *ah)

{

	ATH5K_TRACE(ah->ah_sc);



	if (ah->ah_version == AR5K_AR5210) {

		AR5K_REG_ENABLE_BITS(ah, AR5K_STA_ID1,

			AR5K_STA_ID1_NO_PSPOLL | AR5K_STA_ID1_DEFAULT_ANTENNA);

drivers/net/wireless/ath/ath5k/debug.c

+0 −1
Original line number Diff line number Diff line
@@ -307,7 +307,6 @@ static const struct { 
	{ ATH5K_DEBUG_DUMP_RX,	"dumprx",	"print received skb content" },

	{ ATH5K_DEBUG_DUMP_TX,	"dumptx",	"print transmit skb content" },

	{ ATH5K_DEBUG_DUMPBANDS, "dumpbands",	"dump bands" },

	{ ATH5K_DEBUG_TRACE,	"trace",	"trace function calls" },

	{ ATH5K_DEBUG_ANI,	"ani",		"adaptive noise immunity" },

	{ ATH5K_DEBUG_ANY,	"all",		"show all debug levels" },

};

drivers/net/wireless/ath/ath5k/debug.h

+0 −8
Original line number Diff line number Diff line
@@ -115,18 +115,12 @@ enum ath5k_debug_level { 
	ATH5K_DEBUG_DUMP_RX	= 0x00000100,

	ATH5K_DEBUG_DUMP_TX	= 0x00000200,

	ATH5K_DEBUG_DUMPBANDS	= 0x00000400,

	ATH5K_DEBUG_TRACE	= 0x00001000,

	ATH5K_DEBUG_ANI		= 0x00002000,

	ATH5K_DEBUG_ANY		= 0xffffffff

};



#ifdef CONFIG_ATH5K_DEBUG



#define ATH5K_TRACE(_sc) do { \

	if (unlikely((_sc)->debug.level & ATH5K_DEBUG_TRACE)) \

		printk(KERN_DEBUG "ath5k trace %s:%d\n", __func__, __LINE__); \

	} while (0)



#define ATH5K_DBG(_sc, _m, _fmt, ...) do { \

	if (unlikely((_sc)->debug.level & (_m) && net_ratelimit())) \

		ATH5K_PRINTK(_sc, KERN_DEBUG, "(%s:%d): " _fmt, \
@@ -168,8 +162,6 @@ ath5k_debug_printtxbuf(struct ath5k_softc *sc, struct ath5k_buf *bf); 


#include <linux/compiler.h>



#define ATH5K_TRACE(_sc) typecheck(struct ath5k_softc *, (_sc))



static inline void __attribute__ ((format (printf, 3, 4)))

ATH5K_DBG(struct ath5k_softc *sc, unsigned int m, const char *fmt, ...) {}

drivers/net/wireless/ath/ath5k/desc.c

+0 −7
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah, 
	struct ath5k_hw_4w_tx_ctl *tx_ctl;

	unsigned int frame_len;



	ATH5K_TRACE(ah->ah_sc);

	tx_ctl = &desc->ud.ds_tx5212.tx_ctl;



	/*
@@ -342,8 +341,6 @@ static int ath5k_hw_proc_2word_tx_status(struct ath5k_hw *ah, 
	struct ath5k_hw_2w_tx_ctl *tx_ctl;

	struct ath5k_hw_tx_status *tx_status;



	ATH5K_TRACE(ah->ah_sc);



	tx_ctl = &desc->ud.ds_tx5210.tx_ctl;

	tx_status = &desc->ud.ds_tx5210.tx_stat;
@@ -396,8 +393,6 @@ static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah, 
	struct ath5k_hw_4w_tx_ctl *tx_ctl;

	struct ath5k_hw_tx_status *tx_status;



	ATH5K_TRACE(ah->ah_sc);



	tx_ctl = &desc->ud.ds_tx5212.tx_ctl;

	tx_status = &desc->ud.ds_tx5212.tx_stat;
@@ -490,7 +485,6 @@ static int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc, 
{

	struct ath5k_hw_rx_ctl *rx_ctl;



	ATH5K_TRACE(ah->ah_sc);

	rx_ctl = &desc->ud.ds_rx.rx_ctl;



	/*
@@ -593,7 +587,6 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah, 
	struct ath5k_hw_rx_status *rx_status;

	struct ath5k_hw_rx_error *rx_err;



	ATH5K_TRACE(ah->ah_sc);

	rx_status = &desc->ud.ds_rx.u.rx_stat;



	/* Overlay on error */