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

Commit bc042b67 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove #ifdef BCMDBG from regular functions 



Under error condition debug functions are being called which
only have implementation when BCMDBG is defined. This result
in #ifdef BCMDBG blocks in functions. This patch fixes this by
mapping the debug functions to empty macro when BCMDBG is not
defined. This makes the calling function easier to read.

Reviewed-by: default avatarBrett Rudley <brudley@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 77919fd7

drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c

+1 −3
Original line number Diff line number Diff line
@@ -1069,13 +1069,11 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, 
			WL_ERROR("wl%d: wlc_ampdu_dotxstatus: tx phy error (0x%x)\n",

				 wlc->pub->unit, txs->phyerr);



#ifdef BCMDBG

			if (WL_ERROR_ON()) {

				prpkt("txpkt (AMPDU)", wlc->osh, p);

				wlc_print_txdesc((d11txh_t *) p->data);

				wlc_print_txstatus(txs);

			}

#endif				/* BCMDBG */

			wlc_print_txstatus(txs);

		}

	}

drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c

+7 −9
Original line number Diff line number Diff line
@@ -222,6 +222,8 @@ static bool in_send_q = false; 
static const char *fifo_names[] = {

	"AC_BK", "AC_BE", "AC_VI", "AC_VO", "BCMC", "ATIM" };

const char *aci_names[] = { "AC_BE", "AC_BK", "AC_VI", "AC_VO" };

#else

static const char fifo_names[6][0];

#endif



static const u8 acbitmap2maxprio[] = {
@@ -6414,7 +6416,6 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw, 
						    (u16) newfragthresh;

					}

				}

#if defined(BCMDBG)

			} else

				WL_ERROR("wl%d: %s txop invalid for rate %d\n",

					 wlc->pub->unit, fifo_names[queue],
@@ -6426,9 +6427,6 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw, 
					 fifo_names[queue],

					 phylen, wlc->fragthresh[queue],

					 dur, wlc->edcf_txop[ac]);

#else

			}

#endif

		}

	}
@@ -6696,11 +6694,11 @@ wlc_dotxstatus(struct wlc_info *wlc, tx_status_t *txs, u32 frm_tx2) 
	mcl = ltoh16(txh->MacTxControlLow);



	if (txs->phyerr) {

		if (WL_ERROR_ON()) {

			WL_ERROR("phyerr 0x%x, rate 0x%x\n",

				 txs->phyerr, txh->MainRates);

#if defined(BCMDBG)

			wlc_print_txdesc(txh);

#endif

		}

		wlc_print_txstatus(txs);

	}

drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h

+2 −0
Original line number Diff line number Diff line
@@ -842,6 +842,8 @@ extern void wlc_print_rxh(d11rxhdr_t *rxh); 
extern void wlc_print_hdrs(struct wlc_info *wlc, const char *prefix, u8 *frame,

			   d11txh_t *txh, d11rxhdr_t *rxh, uint len);

extern void wlc_print_txdesc(d11txh_t *txh);

#else

#define wlc_print_txdesc(a)

#endif

#if defined(BCMDBG)

extern void wlc_print_dot11_mac_hdr(u8 *buf, int len);

drivers/staging/brcm80211/include/bcmutils.h

+3 −0
Original line number Diff line number Diff line
@@ -152,7 +152,10 @@ extern struct sk_buff *pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out); 
#ifdef BCMDBG

	extern void prpkt(const char *msg, struct osl_info *osh,

			  struct sk_buff *p0);

#else

#define prpkt(a, b, c)

#endif				/* BCMDBG */



#define bcm_perf_enable()

#define bcmstats(fmt)

#define	bcmlog(fmt, a1, a2)