Staging: brcm80211: remove FALSE #define

use the kernel provided 'false' value instead, especially
as we are using a 'bool' for these variables.

Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

6 files changed, 7 insertions, 11 deletions

diff --git a/drivers/staging/brcm80211/include/bcmnvram.h b/drivers/staging/brcm80211/include/bcmnvram.h
index 7fe95e7619df..adb2eb766c3f 100644
--- a/drivers/staging/brcm80211/include/bcmnvram.h
+++ b/drivers/staging/brcm80211/include/bcmnvram.h
@@ -89,7 +89,7 @@ extern int nvram_resetgpio_init(void *sih);
  * @param	name	name of variable to match
  * @param	match	value to compare against value of variable
  * @return	true if variable is defined and its value is string equal
- *		to match or FALSE otherwise
+ *		to match or false otherwise
  */
 static inline int nvram_match(char *name, char *match)
 {
@@ -102,7 +102,7 @@ static inline int nvram_match(char *name, char *match)
  * @param	name	name of variable to match
  * @param	match	value to compare against value of variable
  * @return	true if variable is defined and its value is not string
- *		equal to invmatch or FALSE otherwise
+ *		equal to invmatch or false otherwise
  */
 static inline int nvram_invmatch(char *name, char *invmatch)
 {
diff --git a/drivers/staging/brcm80211/include/bcmsdh_sdmmc.h b/drivers/staging/brcm80211/include/bcmsdh_sdmmc.h
index 1c8fd432ab2e..7d5aa71a7dc7 100644
--- a/drivers/staging/brcm80211/include/bcmsdh_sdmmc.h
+++ b/drivers/staging/brcm80211/include/bcmsdh_sdmmc.h
@@ -62,7 +62,7 @@ struct sdioh_info {
 	uint irq;		/* Client irq */
 	int intrcount;		/* Client interrupts */
 	bool sd_use_dma;	/* DMA on CMD53 */
-	bool sd_blockmode;	/* sd_blockmode == FALSE => 64 Byte Cmd 53s. */
+	bool sd_blockmode;	/* sd_blockmode == false => 64 Byte Cmd 53s. */
 	/*  Must be on for sd_multiblock to be effective */
 	bool use_client_ints;	/* If this is false, make sure to restore */
 	int sd_mode;		/* SD1/SD4/SPI */
diff --git a/drivers/staging/brcm80211/include/linux_osl.h b/drivers/staging/brcm80211/include/linux_osl.h
index a8ccc74cc4b4..9fbb6cca3907 100644
--- a/drivers/staging/brcm80211/include/linux_osl.h
+++ b/drivers/staging/brcm80211/include/linux_osl.h
@@ -335,7 +335,7 @@ extern int osl_error(int bcmerror);
 #define	PKTTAG(skb)		((void *)(((struct sk_buff *)(skb))->cb))
 #define PKTALLOCED(osh)		(((osl_pubinfo_t *)(osh))->pktalloced)
 #define PKTSETPOOL(osh, skb, x, y)	do {} while (0)
-#define PKTPOOL(osh, skb)		FALSE
+#define PKTPOOL(osh, skb)		false
 extern void *osl_pktget(osl_t *osh, uint len);
 extern void osl_pktfree(osl_t *osh, void *skb, bool send);
 
diff --git a/drivers/staging/brcm80211/include/nicpci.h b/drivers/staging/brcm80211/include/nicpci.h
index 76578db8b85e..ce146e88ffdf 100644
--- a/drivers/staging/brcm80211/include/nicpci.h
+++ b/drivers/staging/brcm80211/include/nicpci.h
@@ -38,10 +38,10 @@
 #define pcicore_pcieserdesreg(a, b, c, d, e) (0)
 #define pcicore_pciereg(a, b, c, d, e) (0)
 
-#define pcicore_pmecap_fast(a)	(FALSE)
+#define pcicore_pmecap_fast(a)	(false)
 #define pcicore_pmeen(a)	do { } while (0)
 #define pcicore_pmeclr(a)	do { } while (0)
-#define pcicore_pmestat(a)	(FALSE)
+#define pcicore_pmestat(a)	(false)
 #else
 struct sbpcieregs;
 
diff --git a/drivers/staging/brcm80211/include/osl.h b/drivers/staging/brcm80211/include/osl.h
index a9aee5ca1107..c0ebb3d97220 100644
--- a/drivers/staging/brcm80211/include/osl.h
+++ b/drivers/staging/brcm80211/include/osl.h
@@ -51,7 +51,7 @@ typedef void (*osl_wreg_fn_t) (void *ctx, void *reg, unsigned int val,
 
 #if !defined(OSL_SYSUPTIME)
 #define OSL_SYSUPTIME() (0)
-#define OSL_SYSUPTIME_SUPPORT FALSE
+#define OSL_SYSUPTIME_SUPPORT false
 #else
 #define OSL_SYSUPTIME_SUPPORT true
 #endif				/* OSL_SYSUPTIME */
diff --git a/drivers/staging/brcm80211/include/typedefs.h b/drivers/staging/brcm80211/include/typedefs.h
index 9e63ea68536e..55fc41e1cfdb 100644
--- a/drivers/staging/brcm80211/include/typedefs.h
+++ b/drivers/staging/brcm80211/include/typedefs.h
@@ -30,10 +30,6 @@ typedef unsigned int uintptr;
 
 #undef TYPEDEF_UINTPTR
 
-#ifndef FALSE
-#define FALSE	0
-#endif
-
 #ifndef OFF
 #define	OFF	0
 #endif