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

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

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: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ca9c786d

drivers/staging/brcm80211/brcmfmac/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ ccflags-y := \ 
	-DBRCMF_SDALIGN=64	\

	-DMAX_HDR_READ=64



ccflags-$(CONFIG_BRCMDBG)	+= -DDHD_DEBUG -DSHOW_EVENTS

ccflags-$(CONFIG_BRCMDBG)	+= -DSHOW_EVENTS



ccflags-y += \

	-Idrivers/staging/brcm80211/brcmfmac	\

drivers/staging/brcm80211/brcmfmac/bcmsdbus.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ brcmf_sdioh_interrupt_query(struct sdioh_info *si, bool *onoff); 
extern int

brcmf_sdioh_interrupt_set(struct sdioh_info *si, bool enable_disable);



#if defined(DHD_DEBUG)

#if defined(BCMDBG)

extern bool brcmf_sdioh_interrupt_pending(struct sdioh_info *si);

#endif

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ int brcmf_sdcard_intr_dereg(void *sdh) 
	return SDIOH_API_SUCCESS(status) ? 0 : -EIO;

}



#if defined(DHD_DEBUG)

#if defined(BCMDBG)

bool brcmf_sdcard_intr_pending(void *sdh)

{

	struct brcmf_sdio *bcmsdh = (struct brcmf_sdio *) sdh;

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ brcmf_sdioh_interrupt_query(struct sdioh_info *sd, bool *onoff) 
	return SDIOH_API_RC_SUCCESS;

}



#if defined(DHD_DEBUG)

#if defined(BCMDBG)

extern bool brcmf_sdioh_interrupt_pending(struct sdioh_info *sd)

{

	return 0;

drivers/staging/brcm80211/brcmfmac/dhd.h

+4 −4
Original line number Diff line number Diff line
@@ -777,10 +777,10 @@ extern atomic_t brcmf_mmc_suspend; 
/* Watchdog timer interval */

extern uint brcmf_watchdog_ms;



#if defined(DHD_DEBUG)

#if defined(BCMDBG)

/* Console output poll interval */

extern uint brcmf_console_ms;

#endif				/* defined(DHD_DEBUG) */

#endif				/* defined(BCMDBG) */



/* Use interrupts */

extern uint brcmf_intr;
@@ -933,9 +933,9 @@ extern int brcmf_custom_get_mac_address(unsigned char *buf); 
extern void brcmf_os_sdunlock_sndup_rxq(dhd_pub_t *pub);

extern void brcmf_os_sdlock_eventq(dhd_pub_t *pub);

extern void brcmf_os_sdunlock_eventq(dhd_pub_t *pub);

#ifdef DHD_DEBUG

#ifdef BCMDBG

extern int brcmf_write_to_file(dhd_pub_t *dhd, u8 *buf, int size);

#endif				/* DHD_DEBUG */

#endif				/* BCMDBG */

#if defined(OOB_INTR_ONLY)

extern int brcmf_customer_oob_irq_map(unsigned long *irq_flags_ptr);

#endif				/* defined(OOB_INTR_ONLY) */