evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: brcm80211: got rid of WL_FFPLD message log macro

Browse source 
Code cleanup. Partially removed, remaining replaced with BCMMSG.

Cc: devel@linuxdriverproject.org
Cc: linux-wireless@vger.kernel.org
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Roland Vossen 2011-05-03 11:36:00 +02:00 • committed by Greg Kroah-Hartman
parent 222508d78f
commit e0c6bf1315
3 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/brcm80211/brcmsmac/wl_dbg.h
View file

@ -22,12 +22,6 @@
/* wl_msg_level is a bit vector with defs in wlioctl.h */ /* wl_msg_level is a bit vector with defs in wlioctl.h */
extern u32 wl_msg_level; extern u32 wl_msg_level;
#define WL_PRINT(level, fmt, args...) \
do { \
if (wl_msg_level & level) \
printk(fmt, ##args); \
} while (0)
#define BCMMSG(dev, fmt, args...) \ #define BCMMSG(dev, fmt, args...) \
do { \ do { \
if (wl_msg_level & WL_TRACE_VAL) \ if (wl_msg_level & WL_TRACE_VAL) \
@ -36,7 +30,6 @@ do { \
#ifdef BCMDBG #ifdef BCMDBG
#define WL_FFPLD(fmt, args...) WL_PRINT(WL_FFPLD_VAL, fmt, ##args)
/* Extra message control for AMPDU debugging */ /* Extra message control for AMPDU debugging */
#define WL_AMPDU_UPDN_VAL 0x00000001 /* Config up/down related */ #define WL_AMPDU_UPDN_VAL 0x00000001 /* Config up/down related */
@ -79,7 +72,6 @@ do { \
#else /* BCMDBG */ #else /* BCMDBG */
#define WL_FFPLD(fmt, args...) no_printk(fmt, ##args)
#define WL_AMPDU_UPDN(fmt, args...) no_printk(fmt, ##args) #define WL_AMPDU_UPDN(fmt, args...) no_printk(fmt, ##args)
#define WL_AMPDU_RX(fmt, args...) no_printk(fmt, ##args) #define WL_AMPDU_RX(fmt, args...) no_printk(fmt, ##args)

13
drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
View file

@ -314,7 +314,7 @@ static int wlc_ffpld_check_txfunfl(struct wlc_info *wlc, int fid)
M_UCODE_MACSTAT + offsetof(macstat_t, txfunfl[fid])); M_UCODE_MACSTAT + offsetof(macstat_t, txfunfl[fid]));
new_txunfl = (u16) (cur_txunfl - fifo->prev_txfunfl); new_txunfl = (u16) (cur_txunfl - fifo->prev_txfunfl);
if (new_txunfl == 0) { if (new_txunfl == 0) {
WL_FFPLD("check_txunfl : TX status FRAG set but no tx underflows\n"); BCMMSG(wlc->wiphy, "TX status FRAG set but no tx underflows\n");
return -1; return -1;
} }
fifo->prev_txfunfl = cur_txunfl; fifo->prev_txfunfl = cur_txunfl;
@ -324,7 +324,6 @@ static int wlc_ffpld_check_txfunfl(struct wlc_info *wlc, int fid)
/* check if fifo is big enough */ /* check if fifo is big enough */
if (wlc_xmtfifo_sz_get(wlc, fid, &xmtfifo_sz)) { if (wlc_xmtfifo_sz_get(wlc, fid, &xmtfifo_sz)) {
WL_FFPLD("check_txunfl : get xmtfifo_sz failed\n");
return -1; return -1;
} }
@ -338,8 +337,8 @@ static int wlc_ffpld_check_txfunfl(struct wlc_info *wlc, int fid)
if (fifo->accum_txfunfl < 10) if (fifo->accum_txfunfl < 10)
return 0; return 0;
WL_FFPLD("ampdu_count %d tx_underflows %d\n", BCMMSG(wlc->wiphy, "ampdu_count %d tx_underflows %d\n",
current_ampdu_cnt, fifo->accum_txfunfl); current_ampdu_cnt, fifo->accum_txfunfl);
/* /*
compute the current ratio of tx unfl per ampdu. compute the current ratio of tx unfl per ampdu.
@ -366,7 +365,6 @@ static int wlc_ffpld_check_txfunfl(struct wlc_info *wlc, int fid)
*/ */
if (fifo->ampdu_pld_size >= max_mpdu * FFPLD_MPDU_SIZE) { if (fifo->ampdu_pld_size >= max_mpdu * FFPLD_MPDU_SIZE) {
WL_FFPLD(("tx fifo pld : max ampdu fits in fifo\n)"));
fifo->accum_txfunfl = 0; fifo->accum_txfunfl = 0;
return 0; return 0;
} }
@ -392,8 +390,9 @@ static int wlc_ffpld_check_txfunfl(struct wlc_info *wlc, int fid)
(max_mpdu * FFPLD_MPDU_SIZE - fifo->ampdu_pld_size)) (max_mpdu * FFPLD_MPDU_SIZE - fifo->ampdu_pld_size))
/ (max_mpdu * FFPLD_MPDU_SIZE)) * 100; / (max_mpdu * FFPLD_MPDU_SIZE)) * 100;
WL_FFPLD("DMA estimated transfer rate %d; pre-load size %d\n", BCMMSG(wlc->wiphy, "DMA estimated transfer rate %d; "
fifo->dmaxferrate, fifo->ampdu_pld_size); "pre-load size %d\n",
fifo->dmaxferrate, fifo->ampdu_pld_size);
} else { } else {
/* decrease ampdu size */ /* decrease ampdu size */

2
drivers/staging/brcm80211/include/wlioctl.h
View file

@ -1247,8 +1247,6 @@ typedef struct tx_inst_power {
/* Message levels */ /* Message levels */
#define WL_ERROR_VAL 0x00000001 #define WL_ERROR_VAL 0x00000001
#define WL_TRACE_VAL 0x00000002 #define WL_TRACE_VAL 0x00000002
#define WL_AMPDU_VAL 0x20000000
#define WL_FFPLD_VAL 0x40000000
/* maximum channels returned by the get valid channels iovar */ /* maximum channels returned by the get valid channels iovar */
#define WL_NUMCHANNELS 64 #define WL_NUMCHANNELS 64