lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: brcm80211: consolidate SHOW_EVENTS code under BCMDBG in fullmac

Browse Source 
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>
This commit is contained in:
Franky Lin
2011-09-01 11:17:03 +02:00
committed by Greg Kroah-Hartman
parent 0629eaebf3
commit 9904663c5e
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/brcm80211/brcmfmac/Makefile
View File

@@ -15,8 +15,6 @@
# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
ccflags-$(CONFIG_BRCMDBG) += -DSHOW_EVENTS
ccflags-y += \ ccflags-y += \
-Idrivers/staging/brcm80211/brcmfmac \ -Idrivers/staging/brcm80211/brcmfmac \
-Idrivers/staging/brcm80211/include -Idrivers/staging/brcm80211/include

8
drivers/staging/brcm80211/brcmfmac/dhd_common.c
View File

@@ -411,7 +411,7 @@ int brcmf_c_ioctl(struct brcmf_pub *drvr, struct brcmf_c_ioctl *ioc, void *buf,
return bcmerror; return bcmerror;
} }
#ifdef SHOW_EVENTS #ifdef BCMDBG
static void static void
brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data) 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"); brcmf_dbg(EVENT, "\n");
} }
} }
#endif /* SHOW_EVENTS */ #endif /* BCMDBG */
int int
brcmf_c_host_event(struct brcmf_info *drvr_priv, int *ifidx, void *pktdata, 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; break;
} }
#ifdef SHOW_EVENTS #ifdef BCMDBG
brcmf_c_show_host_event(event, event_data); brcmf_c_show_host_event(event, event_data);
#endif /* SHOW_EVENTS */ #endif /* BCMDBG */
return 0; return 0;
} }