From: Franky Lin <frankyl@broadcom.com>
Date: Thu, 1 Sep 2011 09:17:03 +0000 (+0200)
Subject: staging: brcm80211: consolidate SHOW_EVENTS code under BCMDBG in fullmac
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9904663c5eab141ae13a0412b178a8331a3dba5d;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git
staging: brcm80211: consolidate SHOW_EVENTS code under BCMDBG in fullmac
Use unify config marco for debug info. Related event debug print out can be
enabled/disabled by the dedicated event message level.
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile
index 826a2ba6a73d..3d0878fac7df 100644
--- a/drivers/staging/brcm80211/brcmfmac/Makefile
+++ b/drivers/staging/brcm80211/brcmfmac/Makefile
@@ -15,8 +15,6 @@
# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-ccflags-$(CONFIG_BRCMDBG) += -DSHOW_EVENTS
-
ccflags-y += \
-Idrivers/staging/brcm80211/brcmfmac \
-Idrivers/staging/brcm80211/include
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index 059289a5d82e..e5214b2908de 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -411,7 +411,7 @@ int brcmf_c_ioctl(struct brcmf_pub *drvr, struct brcmf_c_ioctl *ioc, void *buf,
return bcmerror;
}
-#ifdef SHOW_EVENTS
+#ifdef BCMDBG
static void
brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)
{
@@ -705,7 +705,7 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)
brcmf_dbg(EVENT, "\n");
}
}
-#endif /* SHOW_EVENTS */
+#endif /* BCMDBG */
int
brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata,
@@ -796,9 +796,9 @@ brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata,
break;
}
-#ifdef SHOW_EVENTS
+#ifdef BCMDBG
brcmf_c_show_host_event(event, event_data);
-#endif /* SHOW_EVENTS */
+#endif /* BCMDBG */
return 0;
}