diff options
author | Arend van Spriel <arend@broadcom.com> | 2011-06-29 16:47:35 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 09:57:20 -0700 |
commit | 762c2a36d1af2496ccb3edae31f94f17c47e1a13 (patch) | |
tree | bb3b82b9c902398010dc1b7b1c082ef77293df22 /drivers/staging/brcm80211/brcmfmac/dhd_common.c | |
parent | ca9c786dc24c286a55a36d1a99fa9e85e94fee31 (diff) | |
download | op-kernel-dev-762c2a36d1af2496ccb3edae31f94f17c47e1a13.zip op-kernel-dev-762c2a36d1af2496ccb3edae31f94f17c47e1a13.tar.gz |
staging: brcm80211: replace DHD_DEBUG macro with BCMDBG
The common Makefile for both brcm80211 drivers defines the macro
BCMDBG upon select Kconfig item BRCMDBG. The fullmac source add
another macro DHD_DEBUG with the same meaning. This is removed
and all conditional code now checks for BCMDBG definition.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmfmac/dhd_common.c')
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c index b481eb3..6c41088 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c @@ -39,7 +39,7 @@ char brcmf_nv_path[MOD_PARAM_PATHLEN]; #define EPI_VERSION_STR "4.218.248.5" #define MSGTRACE_VERSION 1 -#ifdef DHD_DEBUG +#ifdef BCMDBG const char brcmf_version[] = "Dongle Host Driver, version " EPI_VERSION_STR "\nCompiled on " __DATE__ " at " __TIME__; @@ -55,7 +55,7 @@ enum { IOV_BCMERROR, IOV_WDTICK, IOV_DUMP, -#ifdef DHD_DEBUG +#ifdef BCMDBG IOV_CONS, IOV_DCONSOLE_POLL, #endif @@ -71,10 +71,10 @@ enum { const struct brcmu_iovar brcmf_iovars[] = { {"version", IOV_VERSION, 0, IOVT_BUFFER, sizeof(brcmf_version)} , -#ifdef DHD_DEBUG +#ifdef BCMDBG {"msglevel", IOV_MSGLEVEL, 0, IOVT_UINT32, 0} , -#endif /* DHD_DEBUG */ +#endif /* BCMDBG */ {"bcmerrorstr", IOV_BCMERRORSTR, 0, IOVT_BUFFER, BCME_STRLEN} , {"bcmerror", IOV_BCMERROR, 0, IOVT_INT8, 0} @@ -83,7 +83,7 @@ const struct brcmu_iovar brcmf_iovars[] = { , {"dump", IOV_DUMP, 0, IOVT_BUFFER, DHD_IOCTL_MAXLEN} , -#ifdef DHD_DEBUG +#ifdef BCMDBG {"dconpoll", IOV_DCONSOLE_POLL, 0, IOVT_UINT32, 0} , {"cons", IOV_CONS, 0, IOVT_BUFFER, 0} @@ -255,7 +255,7 @@ brcmf_c_doiovar(dhd_pub_t *dhd_pub, const struct brcmu_iovar *vi, u32 actionid, bcmerror = brcmf_c_dump(dhd_pub, arg, len); break; -#ifdef DHD_DEBUG +#ifdef BCMDBG case IOV_GVAL(IOV_DCONSOLE_POLL): int_val = (s32) brcmf_console_ms; memcpy(arg, &int_val, val_size); |