Re: drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c:58:6: error: redefinition of 'brcmf_debugfs_init'

From: RafaÅ MiÅecki
Date: Thu Feb 16 2017 - 04:48:10 EST


On 02/16/2017 10:31 AM, Kalle Valo wrote:
(Adding linux-wireless)

Randy Dunlap <rdunlap@xxxxxxxxxxxxx> writes:

On 02/07/17 02:02, kbuild test robot wrote:
Hi Kalle,

FYI, the error/warning still remains.

tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
head: 8b1b41ee74f9712c355d66dc105bbea663ae0afd
commit: 05491d2ccf20b20a1375303441fbbfbd12b24a4f brcm80211: move
under broadcom vendor directory
date: 1 year, 3 months ago
config: mips-allyesconfig (attached as .config)
compiler: mips-linux-gnu-gcc (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
wget
https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross
-O ~/bin/make.cross
chmod +x ~/bin/make.cross
git checkout 05491d2ccf20b20a1375303441fbbfbd12b24a4f
# save the attached .config to linux build tree
make.cross ARCH=mips

All errors (new ones prefixed by >>):

when both:

CONFIG_BRCM_TRACING=y
CONFIG_BRCMDBG=y

but DEBUG is not defined.

I think it would help if CONFIG_BRCMDBG set DEBUG
or if some of the tests for DEBUG used CONFIG_BRCMDBG instead.

Arend or RafaÅ, would you be able to look at this build problem? Kbuild
found the build errors below, apparently a very old issue. It just
blames me now because I moved the driver to a new directory :)

Something like this maybe? Note I didn't test it with above config.

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
index 6687812770cc..8c7695fde482 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
@@ -108,7 +108,7 @@ do { \
extern int brcmf_msg_level;

struct brcmf_pub;
-#ifdef DEBUG
+#ifdef CONFIG_BRCMDBG
void brcmf_debugfs_init(void);
void brcmf_debugfs_exit(void);
int brcmf_debug_attach(struct brcmf_pub *drvr);