Staging: brcm80211: remove TRUE #define

use the kernel provided 'true' 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>

11 files changed, 205 insertions, 205 deletions

diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
index 13e62c4..87b2585 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
@@ -76,7 +76,7 @@ bcmsdh_info_t *bcmsdh_attach(osl_t *osh, void *cfghdl, void **regsva, uint irq)
 	}
 
 	bcmsdh->osh = osh;
-	bcmsdh->init_success = TRUE;
+	bcmsdh->init_success = true;
 
 	*regsva = (u32 *) SI_ENUM_BASE;
 
@@ -129,7 +129,7 @@ int bcmsdh_intr_enable(void *sdh)
 	SDIOH_API_RC status;
 	ASSERT(bcmsdh);
 
-	status = sdioh_interrupt_set(bcmsdh->sdioh, TRUE);
+	status = sdioh_interrupt_set(bcmsdh->sdioh, true);
 	return SDIOH_API_SUCCESS(status) ? 0 : BCME_ERROR;
 }
 
@@ -395,7 +395,7 @@ u32 bcmsdh_reg_read(void *sdh, u32 addr, uint size)
 		case sizeof(u32):
 			return word;
 		default:
-			bcmsdh->regfail = TRUE;
+			bcmsdh->regfail = true;
 
 		}
 	}
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
index d923d54..c6817b7 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
@@ -88,36 +88,36 @@ bool bcmsdh_chipmatch(u16 vendor, u16 device)
 #ifdef BCMSDIOH_STD
 	/* Check for Arasan host controller */
 	if (vendor == VENDOR_SI_IMAGE)
-		return TRUE;
+		return true;
 
 	/* Check for BRCM 27XX Standard host controller */
 	if (device == BCM27XX_SDIOH_ID && vendor == VENDOR_BROADCOM)
-		return TRUE;
+		return true;
 
 	/* Check for BRCM Standard host controller */
 	if (device == SDIOH_FPGA_ID && vendor == VENDOR_BROADCOM)
-		return TRUE;
+		return true;
 
 	/* Check for TI PCIxx21 Standard host controller */
 	if (device == PCIXX21_SDIOH_ID && vendor == VENDOR_TI)
-		return TRUE;
+		return true;
 
 	if (device == PCIXX21_SDIOH0_ID && vendor == VENDOR_TI)
-		return TRUE;
+		return true;
 
 	/* Ricoh R5C822 Standard SDIO Host */
 	if (device == R5C822_SDIOH_ID && vendor == VENDOR_RICOH)
-		return TRUE;
+		return true;
 
 	/* JMicron Standard SDIO Host */
 	if (device == JMICRON_SDIOH_ID && vendor == VENDOR_JMICRON)
-		return TRUE;
+		return true;
 #endif				/* BCMSDIOH_STD */
 #ifdef BCMSDIOH_SPI
 	/* This is the PciSpiHost. */
 	if (device == SPIH_FPGA_ID && vendor == VENDOR_BROADCOM) {
 		printf("Found PCI SPI Host Controller\n");
-		return TRUE;
+		return true;
 	}
 #endif				/* BCMSDIOH_SPI */
 
@@ -621,7 +621,7 @@ int bcmsdh_register_oob_intr(void *dhdp)
 			return -ENODEV;
 
 		set_irq_wake(sdhcinfo->oob_irq, 1);
-		sdhcinfo->oob_irq_registered = TRUE;
+		sdhcinfo->oob_irq_registered = true;
 	}
 
 	return 0;
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index e03e0d8..1f277a3 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -58,7 +58,7 @@ uint sd_power = 1;		/* Default to SD Slot powered ON */
 uint sd_clock = 1;		/* Default to SD Clock turned ON */
 uint sd_hiok = FALSE;		/* Don't use hi-speed mode by default */
 uint sd_msglevel = 0x01;
-uint sd_use_dma = TRUE;
+uint sd_use_dma = true;
 DHD_PM_RESUME_WAIT_INIT(sdioh_request_byte_wait);
 DHD_PM_RESUME_WAIT_INIT(sdioh_request_word_wait);
 DHD_PM_RESUME_WAIT_INIT(sdioh_request_packet_wait);
@@ -138,8 +138,8 @@ extern sdioh_info_t *sdioh_attach(osl_t *osh, void *bar0, uint irq)
 	}
 
 	sd->num_funcs = 2;
-	sd->sd_blockmode = TRUE;
-	sd->use_client_ints = TRUE;
+	sd->sd_blockmode = true;
+	sd->use_client_ints = true;
 	sd->client_block_size[0] = 64;
 
 	gInstance->sd = sd;
@@ -281,7 +281,7 @@ sdioh_interrupt_register(sdioh_info_t *sd, sdioh_cb_fn_t fn, void *argh)
 #if !defined(OOB_INTR_ONLY)
 	sd->intr_handler = fn;
 	sd->intr_handler_arg = argh;
-	sd->intr_handler_valid = TRUE;
+	sd->intr_handler_valid = true;
 
 	/* register and unmask irq */
 	if (gInstance->func[2]) {
@@ -444,7 +444,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name,
 	if (plen >= (int)sizeof(int_val))
 		bcopy(params, &int_val, sizeof(int_val));
 
-	bool_val = (int_val != 0) ? TRUE : FALSE;
+	bool_val = (int_val != 0) ? true : FALSE;
 
 	actionid = set ? IOV_SVAL(vi->varid) : IOV_GVAL(vi->varid);
 	switch (actionid) {
@@ -1041,9 +1041,9 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write,
 		sd_data(("%s: Creating new %s Packet, len=%d\n",
 			 __func__, write ? "TX" : "RX", buflen_u));
 #ifdef DHD_USE_STATIC_BUF
-		mypkt = PKTGET_STATIC(sd->osh, buflen_u, write ? TRUE : FALSE);
+		mypkt = PKTGET_STATIC(sd->osh, buflen_u, write ? true : FALSE);
 #else
-		mypkt = PKTGET(sd->osh, buflen_u, write ? TRUE : FALSE);
+		mypkt = PKTGET(sd->osh, buflen_u, write ? true : FALSE);
 #endif				/* DHD_USE_STATIC_BUF */
 		if (!mypkt) {
 			sd_err(("%s: PKTGET failed: len %d\n",
@@ -1063,9 +1063,9 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write,
 			bcopy(PKTDATA(mypkt), buffer, buflen_u);
 
 #ifdef DHD_USE_STATIC_BUF
-		PKTFREE_STATIC(sd->osh, mypkt, write ? TRUE : FALSE);
+		PKTFREE_STATIC(sd->osh, mypkt, write ? true : FALSE);
 #else
-		PKTFREE(sd->osh, mypkt, write ? TRUE : FALSE);
+		PKTFREE(sd->osh, mypkt, write ? true : FALSE);
 #endif				/* DHD_USE_STATIC_BUF */
 	} else if (((u32) (PKTDATA(pkt)) & DMA_ALIGN_MASK) != 0) {
 		/* Case 2: We have a packet, but it is unaligned. */
@@ -1077,9 +1077,9 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write,
 			 __func__, write ? "TX" : "RX", PKTLEN(pkt)));
 #ifdef DHD_USE_STATIC_BUF
 		mypkt = PKTGET_STATIC(sd->osh, PKTLEN(pkt),
-					write ? TRUE : FALSE);
+					write ? true : FALSE);
 #else
-		mypkt = PKTGET(sd->osh, PKTLEN(pkt), write ? TRUE : FALSE);
+		mypkt = PKTGET(sd->osh, PKTLEN(pkt), write ? true : FALSE);
 #endif				/* DHD_USE_STATIC_BUF */
 		if (!mypkt) {
 			sd_err(("%s: PKTGET failed: len %d\n",
@@ -1099,9 +1099,9 @@ sdioh_request_buffer(sdioh_info_t *sd, uint pio_dma, uint fix_inc, uint write,
 			bcopy(PKTDATA(mypkt), PKTDATA(pkt), PKTLEN(mypkt));
 
 #ifdef DHD_USE_STATIC_BUF
-		PKTFREE_STATIC(sd->osh, mypkt, write ? TRUE : FALSE);
+		PKTFREE_STATIC(sd->osh, mypkt, write ? true : FALSE);
 #else
-		PKTFREE(sd->osh, mypkt, write ? TRUE : FALSE);
+		PKTFREE(sd->osh, mypkt, write ? true : FALSE);
 #endif				/* DHD_USE_STATIC_BUF */
 	} else {		/* case 3: We have a packet and
 				 it is aligned. */
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd.h b/drivers/staging/brcm80211/brcmfmac/dhd.h
index 04c7134..6d0c0dd 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd.h
+++ b/drivers/staging/brcm80211/brcmfmac/dhd.h
@@ -87,7 +87,7 @@ typedef struct dhd_pub {
 	/* Internal dhd items */
 	bool up;		/* Driver up/down (to OS) */
 	bool txoff;		/* Transmit flow-controlled */
-	bool dongle_reset;	/* TRUE = DEVRESET put dongle into reset */
+	bool dongle_reset;	/* true = DEVRESET put dongle into reset */
 	enum dhd_bus_state busstate;
 	uint hdrlen;		/* Total DHD header length (proto + bus) */
 	uint maxctl;		/* Max size rxctl request from proto to bus */
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_bus.h b/drivers/staging/brcm80211/brcmfmac/dhd_bus.h
index c522e9a1..3b39c99 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_bus.h
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_bus.h
@@ -52,7 +52,7 @@ extern bool dhd_bus_watchdog(dhd_pub_t *dhd);
 extern int dhd_bus_console_in(dhd_pub_t *dhd, unsigned char *msg, uint msglen);
 #endif				/* DHD_DEBUG */
 
-/* Deferred processing for the bus, return TRUE requests reschedule */
+/* Deferred processing for the bus, return true requests reschedule */
 extern bool dhd_bus_dpc(struct dhd_bus *bus);
 extern void dhd_bus_isr(bool *InterruptRecognized,
 			bool *QueueMiniportHandleInterrupt, void *arg);
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
index 71047ca..a8c385f 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
@@ -248,7 +248,7 @@ dhd_prot_ioctl(dhd_pub_t *dhd, int ifidx, wl_ioctl_t *ioc, void *buf, int len)
 	if (len > WLC_IOCTL_MAXLEN)
 		goto done;
 
-	if (prot->pending == TRUE) {
+	if (prot->pending == true) {
 		DHD_TRACE(("CDC packet is pending!!!! cmd=0x%x (%lu) "
 			"lastcmd=0x%x (%lu)\n",
 			ioc->cmd, (unsigned long)ioc->cmd, prot->lastcmd,
@@ -259,7 +259,7 @@ dhd_prot_ioctl(dhd_pub_t *dhd, int ifidx, wl_ioctl_t *ioc, void *buf, int len)
 		goto done;
 	}
 
-	prot->pending = TRUE;
+	prot->pending = true;
 	prot->lastcmd = ioc->cmd;
 	if (ioc->set)
 		ret = dhdcdc_set_ioctl(dhd, ifidx, ioc->cmd, buf, len);
@@ -349,7 +349,7 @@ bool dhd_proto_fcinfo(dhd_pub_t *dhd, void *pktbuf, u8 * fcbits)
 
 	*fcbits = h->priority >> BDC_PRIORITY_FC_SHIFT;
 	if ((h->flags2 & BDC_FLAG2_FC_FLAG) == BDC_FLAG2_FC_FLAG)
-		return TRUE;
+		return true;
 #endif
 	return FALSE;
 }
@@ -391,7 +391,7 @@ int dhd_prot_hdrpull(dhd_pub_t *dhd, int *ifidx, void *pktbuf)
 		DHD_INFO(("%s: BDC packet received with good rx-csum, "
 			"flags 0x%x\n",
 			dhd_ifname(dhd, *ifidx), h->flags));
-		PKTSETSUMGOOD(pktbuf, TRUE);
+		PKTSETSUMGOOD(pktbuf, true);
 	}
 
 	PKTSETPRIO(pktbuf, (h->priority & BDC_PRIORITY_MASK));
@@ -489,7 +489,7 @@ int dhd_prot_init(dhd_pub_t *dhd)
 #endif				/* EMBEDDED_PLATFORM */
 
 	/* Always assumes wl for now */
-	dhd->iswl = TRUE;
+	dhd->iswl = true;
 
 	return ret;
 }
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index 79ded63..36084e4 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -337,7 +337,7 @@ bool dhd_prec_enq(dhd_pub_t *dhdp, struct pktq *q, void *pkt, int prec)
 	 */
 	if (!pktq_pfull(q, prec) && !pktq_full(q)) {
 		pktq_penq(q, prec, pkt);
-		return TRUE;
+		return true;
 	}
 
 	/* Determine precedence from which to evict packet, if any */
@@ -366,7 +366,7 @@ bool dhd_prec_enq(dhd_pub_t *dhdp, struct pktq *q, void *pkt, int prec)
 			ASSERT(p);
 		}
 
-		PKTFREE(dhdp->osh, p, TRUE);
+		PKTFREE(dhdp->osh, p, true);
 	}
 
 	/* Enqueue */
@@ -376,7 +376,7 @@ bool dhd_prec_enq(dhd_pub_t *dhdp, struct pktq *q, void *pkt, int prec)
 		ASSERT(p);
 	}
 
-	return TRUE;
+	return true;
 }
 
 static int
@@ -608,11 +608,11 @@ static void wl_show_host_event(wl_event_msg_t *event, void *event_data)
 	DHD_EVENT(("EVENT: %s, event ID = %d\n", event_name, event_type));
 
 	if (flags & WLC_EVENT_MSG_LINK)
-		link = TRUE;
+		link = true;
 	if (flags & WLC_EVENT_MSG_GROUP)
-		group = TRUE;
+		group = true;
 	if (flags & WLC_EVENT_MSG_FLUSHTXQ)
-		flush_txq = TRUE;
+		flush_txq = true;
 
 	switch (event_type) {
 	case WLC_E_START:
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index e8debe4..5c8224f 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -273,7 +273,7 @@ module_param_string(nvram_path, nvram_path, MOD_PARAM_PATHLEN, 0);
 module_param(dhd_msg_level, int, 0);
 
 /* Spawn a thread for system ioctls (set mac, set mcast) */
-uint dhd_sysioc = TRUE;
+uint dhd_sysioc = true;
 module_param(dhd_sysioc, uint, 0);
 
 /* Watchdog interval */
@@ -292,11 +292,11 @@ uint dhd_arp_mode = 0xb;
 module_param(dhd_arp_mode, uint, 0);
 
 /* ARP offload enable */
-uint dhd_arp_enable = TRUE;
+uint dhd_arp_enable = true;
 module_param(dhd_arp_enable, uint, 0);
 
 /* Global Pkt filter enable control */
-uint dhd_pkt_filter_enable = TRUE;
+uint dhd_pkt_filter_enable = true;
 module_param(dhd_pkt_filter_enable, uint, 0);
 
 /*  Pkt filter init setup */
@@ -304,7 +304,7 @@ uint dhd_pkt_filter_init;
 module_param(dhd_pkt_filter_init, uint, 0);
 
 /* Pkt filter mode control */
-uint dhd_master_mode = TRUE;
+uint dhd_master_mode = true;
 module_param(dhd_master_mode, uint, 1);
 
 /* Watchdog thread priority, -1 to use kernel timer */
@@ -347,11 +347,11 @@ uint dhd_poll = FALSE;
 module_param(dhd_poll, uint, 0);
 
 /* Use cfg80211 */
-uint dhd_cfg80211 = TRUE;
+uint dhd_cfg80211 = true;
 module_param(dhd_cfg80211, uint, 0);
 
 /* Use interrupts */
-uint dhd_intr = TRUE;
+uint dhd_intr = true;
 module_param(dhd_intr, uint, 0);
 
 /* SDIO Drive Strength (in milliamps) */
@@ -422,7 +422,7 @@ static int dhd_sleep_pm_callback(struct notifier_block *nfb,
 	switch (action) {
 	case PM_HIBERNATION_PREPARE:
 	case PM_SUSPEND_PREPARE:
-		dhd_mmc_suspend = TRUE;
+		dhd_mmc_suspend = true;
 		return NOTIFY_OK;
 	case PM_POST_HIBERNATION:
 	case PM_POST_SUSPEND:
@@ -707,7 +707,7 @@ static void _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx)
 	cnt = netdev_mc_count(dev);
 
 	/* Determine initial value of allmulti flag */
-	allmulti = (dev->flags & IFF_ALLMULTI) ? TRUE : FALSE;
+	allmulti = (dev->flags & IFF_ALLMULTI) ? true : FALSE;
 
 	/* Send down the multicast list first. */
 
@@ -738,13 +738,13 @@ static void _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx)
 	ioc.cmd = WLC_SET_VAR;
 	ioc.buf = buf;
 	ioc.len = buflen;
-	ioc.set = TRUE;
+	ioc.set = true;
 
 	ret = dhd_prot_ioctl(&dhd->pub, ifidx, &ioc, ioc.buf, ioc.len);
 	if (ret < 0) {
 		DHD_ERROR(("%s: set mcast_list failed, cnt %d\n",
 			   dhd_ifname(&dhd->pub, ifidx), cnt));
-		allmulti = cnt ? TRUE : allmulti;
+		allmulti = cnt ? true : allmulti;
 	}
 
 	MFREE(dhd->pub.osh, buf, buflen);
@@ -776,7 +776,7 @@ static void _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx)
 	ioc.cmd = WLC_SET_VAR;
 	ioc.buf = buf;
 	ioc.len = buflen;
-	ioc.set = TRUE;
+	ioc.set = true;
 
 	ret = dhd_prot_ioctl(&dhd->pub, ifidx, &ioc, ioc.buf, ioc.len);
 	if (ret < 0) {
@@ -789,14 +789,14 @@ static void _dhd_set_multicast_list(dhd_info_t *dhd, int ifidx)
 	/* Finally, pick up the PROMISC flag as well, like the NIC
 		 driver does */
 
-	allmulti = (dev->flags & IFF_PROMISC) ? TRUE : FALSE;
+	allmulti = (dev->flags & IFF_PROMISC) ? true : FALSE;
 	allmulti = htol32(allmulti);
 
 	memset(&ioc, 0, sizeof(ioc));
 	ioc.cmd = WLC_SET_PROMISC;
 	ioc.buf = &allmulti;
 	ioc.len = sizeof(allmulti);
-	ioc.set = TRUE;
+	ioc.set = true;
 
 	ret = dhd_prot_ioctl(&dhd->pub, ifidx, &ioc, ioc.buf, ioc.len);
 	if (ret < 0) {
@@ -823,7 +823,7 @@ _dhd_set_mac_address(dhd_info_t *dhd, int ifidx, struct ether_addr *addr)
 	ioc.cmd = WLC_SET_VAR;
 	ioc.buf = buf;
 	ioc.len = 32;
-	ioc.set = TRUE;
+	ioc.set = true;
 
 	ret = dhd_prot_ioctl(&dhd->pub, ifidx, &ioc, ioc.buf, ioc.len);
 	if (ret < 0) {
@@ -999,7 +999,7 @@ static int dhd_set_mac_address(struct net_device *dev, void *addr)
 
 	ASSERT(dhd->sysioc_tsk);
 	memcpy(&dhd->macvalue, sa->sa_data, ETHER_ADDR_LEN);
-	dhd->set_macaddress = TRUE;
+	dhd->set_macaddress = true;
 	up(&dhd->sysioc_sem);
 
 	return ret;
@@ -1015,7 +1015,7 @@ static void dhd_set_multicast_list(struct net_device *dev)
 		return;
 
 	ASSERT(dhd->sysioc_tsk);
-	dhd->set_multicast = TRUE;
+	dhd->set_multicast = true;
 	up(&dhd->sysioc_sem);
 }
 
@@ -1376,7 +1376,7 @@ static int dhd_dpc_thread(void *data)
 				}
 				WAKE_UNLOCK(&dhd->pub, WAKE_LOCK_DPC);
 			} else {
-				dhd_bus_stop(dhd->pub.bus, TRUE);
+				dhd_bus_stop(dhd->pub.bus, true);
 			}
 		} else
 			break;
@@ -1397,7 +1397,7 @@ static void dhd_dpc(unsigned long data)
 		if (dhd_bus_dpc(dhd->pub.bus))
 			tasklet_schedule(&dhd->tasklet);
 	} else {
-		dhd_bus_stop(dhd->pub.bus, TRUE);
+		dhd_bus_stop(dhd->pub.bus, true);
 	}
 }
 
@@ -1461,7 +1461,7 @@ static int dhd_toe_set(dhd_info_t *dhd, int ifidx, u32 toe_ol)
 	ioc.cmd = WLC_SET_VAR;
 	ioc.buf = buf;
 	ioc.len = (uint) sizeof(buf);
-	ioc.set = TRUE;
+	ioc.set = true;
 
 	/* Set toe_ol as requested */
 
@@ -1818,7 +1818,7 @@ static int dhd_open(struct net_device *net)
 
 osl_t *dhd_osl_attach(void *pdev, uint bustype)
 {
-	return osl_attach(pdev, bustype, TRUE);
+	return osl_attach(pdev, bustype, true);
 }
 
 void dhd_osl_detach(osl_t *osh)
@@ -1985,7 +1985,7 @@ dhd_pub_t *dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen)
 	/* Initialize thread based operation and lock */
 	init_MUTEX(&dhd->sdsem);
 	if ((dhd_watchdog_prio >= 0) && (dhd_dpc_prio >= 0))
-		dhd->threads_only = TRUE;
+		dhd->threads_only = true;
 	else
 		dhd->threads_only = FALSE;
 
@@ -2102,7 +2102,7 @@ int dhd_bus_start(dhd_pub_t *dhdp)
 	dhd_os_wd_timer(&dhd->pub, dhd_watchdog_ms);
 
 	/* Bring up the bus */
-	ret = dhd_bus_init(&dhd->pub, TRUE);
+	ret = dhd_bus_init(&dhd->pub, true);
 	if (ret != 0) {
 		DHD_ERROR(("%s, dhd_bus_init failed %d\n", __func__, ret));
 		return ret;
@@ -2117,7 +2117,7 @@ int dhd_bus_start(dhd_pub_t *dhdp)
 	}
 
 	/* Enable oob at firmware */
-	dhd_enable_oob_intr(dhd->pub.bus, TRUE);
+	dhd_enable_oob_intr(dhd->pub.bus, true);
 #endif				/* defined(OOB_INTR_ONLY) */
 
 	/* If bus is not ready, can't come up */
@@ -2295,7 +2295,7 @@ void dhd_bus_detach(dhd_pub_t *dhdp)
 			dhd_prot_stop(&dhd->pub);
 
 			/* Stop the bus module */
-			dhd_bus_stop(dhd->pub.bus, TRUE);
+			dhd_bus_stop(dhd->pub.bus, true);
 #if defined(OOB_INTR_ONLY)
 			bcmsdh_unregister_oob_intr();
 #endif				/* defined(OOB_INTR_ONLY) */
@@ -2504,7 +2504,7 @@ int dhd_os_ioctl_resp_wait(dhd_pub_t *pub, uint *condition, bool *pending)
 		timeout = schedule_timeout(timeout);
 
 	if (signal_pending(current))
-		*pending = TRUE;
+		*pending = true;
 
 	set_current_state(TASK_RUNNING);
 	remove_wait_queue(&dhd->ioctl_resp_wait, &wait);
@@ -2533,7 +2533,7 @@ void dhd_os_wd_timer(void *bus, uint wdtick)
 		return;
 
 	/* Totally stop the timer */
-	if (!wdtick && dhd->wd_timer_valid == TRUE) {
+	if (!wdtick && dhd->wd_timer_valid == true) {
 		del_timer_sync(&dhd->timer);
 		dhd->wd_timer_valid = FALSE;
 		save_dhd_watchdog_ms = wdtick;
@@ -2545,7 +2545,7 @@ void dhd_os_wd_timer(void *bus, uint wdtick)
 
 		if (save_dhd_watchdog_ms != dhd_watchdog_ms) {
 
-			if (dhd->wd_timer_valid == TRUE)
+			if (dhd->wd_timer_valid == true)
 				/* Stop timer and restart at new value */
 				del_timer_sync(&dhd->timer);
 
@@ -2562,7 +2562,7 @@ void dhd_os_wd_timer(void *bus, uint wdtick)
 				  jiffies + dhd_watchdog_ms * HZ / 1000);
 		}
 
-		dhd->wd_timer_valid = TRUE;
+		dhd->wd_timer_valid = true;
 		save_dhd_watchdog_ms = wdtick;
 	}
 }
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index 0eb7eef..40157a1 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -588,7 +588,7 @@ static int dhdsdio_htclk(dhd_bus_t *bus, bool on, bool pendok)
 		DHD_INFO(("CLKCTL: turned ON\n"));
 
 #if defined(DHD_DEBUG)
-		if (bus->alp_only == TRUE) {
+		if (bus->alp_only == true) {
 #if !defined(BCMLXSDMMC)
 			if (!SBSDIO_ALPONLY(clkctl)) {
 				DHD_ERROR(("%s: HT Clock, when ALP Only\n",
@@ -603,7 +603,7 @@ static int dhdsdio_htclk(dhd_bus_t *bus, bool on, bool pendok)
 		}
 #endif				/* defined (DHD_DEBUG) */
 
-		bus->activity = TRUE;
+		bus->activity = true;
 	} else {
 		clkreq = 0;
 
@@ -643,7 +643,7 @@ static int dhdsdio_sdclk(dhd_bus_t *bus, bool on)
 			/* Turn on clock and restore mode */
 			iovalue = 1;
 			err = bcmsdh_iovar_op(bus->sdh, "sd_clock", NULL, 0,
-					      &iovalue, sizeof(iovalue), TRUE);
+					      &iovalue, sizeof(iovalue), true);
 			if (err) {
 				DHD_ERROR(("%s: error enabling sd_clock: %d\n",
 					   __func__, err));
@@ -652,7 +652,7 @@ static int dhdsdio_sdclk(dhd_bus_t *bus, bool on)
 
 			iovalue = bus->sd_mode;
 			err = bcmsdh_iovar_op(bus->sdh, "sd_mode", NULL, 0,
-					      &iovalue, sizeof(iovalue), TRUE);
+					      &iovalue, sizeof(iovalue), true);
 			if (err) {
 				DHD_ERROR(("%s: error changing sd_mode: %d\n",
 					   __func__, err));
@@ -662,7 +662,7 @@ static int dhdsdio_sdclk(dhd_bus_t *bus, bool on)
 			/* Restore clock speed */
 			iovalue = bus->sd_divisor;
 			err = bcmsdh_iovar_op(bus->sdh, "sd_divisor", NULL, 0,
-					      &iovalue, sizeof(iovalue), TRUE);
+					      &iovalue, sizeof(iovalue), true);
 			if (err) {
 				DHD_ERROR(("%s: error restoring sd_divisor: %d\n",
 					__func__, err));
@@ -684,7 +684,7 @@ static int dhdsdio_sdclk(dhd_bus_t *bus, bool on)
 				err =
 				    bcmsdh_iovar_op(bus->sdh, "sd_mode", NULL,
 						    0, &iovalue,
-						    sizeof(iovalue), TRUE);
+						    sizeof(iovalue), true);
 				if (err) {
 					DHD_ERROR(("%s: error changing sd_clock: %d\n",
 						__func__, err));
@@ -694,7 +694,7 @@ static int dhdsdio_sdclk(dhd_bus_t *bus, bool on)
 
 			iovalue = 0;
 			err = bcmsdh_iovar_op(bus->sdh, "sd_clock", NULL, 0,
-					      &iovalue, sizeof(iovalue), TRUE);
+					      &iovalue, sizeof(iovalue), true);
 			if (err) {
 				DHD_ERROR(("%s: error disabling sd_clock: %d\n",
 					   __func__, err));
@@ -704,7 +704,7 @@ static int dhdsdio_sdclk(dhd_bus_t *bus, bool on)
 			/* Set divisor to idle value */
 			iovalue = bus->idleclock;
 			err = bcmsdh_iovar_op(bus->sdh, "sd_divisor", NULL, 0,
-					      &iovalue, sizeof(iovalue), TRUE);
+					      &iovalue, sizeof(iovalue), true);
 			if (err) {
 				DHD_ERROR(("%s: error changing sd_divisor: %d\n",
 					__func__, err));
@@ -730,7 +730,7 @@ static int dhdsdio_clkctl(dhd_bus_t *bus, uint target, bool pendok)
 	if (bus->clkstate == target) {
 		if (target == CLK_AVAIL) {
 			dhd_os_wd_timer(bus->dhd, dhd_watchdog_ms);
-			bus->activity = TRUE;
+			bus->activity = true;
 		}
 		return BCME_OK;
 	}
@@ -739,17 +739,17 @@ static int dhdsdio_clkctl(dhd_bus_t *bus, uint target, bool pendok)
 	case CLK_AVAIL:
 		/* Make sure SD clock is available */
 		if (bus->clkstate == CLK_NONE)
-			dhdsdio_sdclk(bus, TRUE);
+			dhdsdio_sdclk(bus, true);
 		/* Now request HT Avail on the backplane */
-		dhdsdio_htclk(bus, TRUE, pendok);
+		dhdsdio_htclk(bus, true, pendok);
 		dhd_os_wd_timer(bus->dhd, dhd_watchdog_ms);
-		bus->activity = TRUE;
+		bus->activity = true;
 		break;
 
 	case CLK_SDONLY:
 		/* Remove HT request, or bring up SD clock */
 		if (bus->clkstate == CLK_NONE)
-			dhdsdio_sdclk(bus, TRUE);
+			dhdsdio_sdclk(bus, true);
 		else if (bus->clkstate == CLK_AVAIL)
 			dhdsdio_htclk(bus, FALSE, FALSE);
 		else
@@ -819,7 +819,7 @@ int dhdsdio_bussleep(dhd_bus_t *bus, bool sleep)
 		}
 
 		/* Change state */
-		bus->sleeping = TRUE;
+		bus->sleeping = true;
 
 	} else {
 		/* Waking up: bus power up is ok, set local state */
@@ -871,7 +871,7 @@ void dhd_enable_oob_intr(struct dhd_bus *bus, bool enable)
 	uint retries = 0;
 
 	dhdsdio_clkctl(bus, CLK_AVAIL, FALSE);
-	if (enable == TRUE) {
+	if (enable == true) {
 
 		/* Tell device to start using OOB wakeup */
 		W_SDREG(SMB_USE_OOB, &regs->tosbmailbox, retries);
@@ -930,7 +930,7 @@ static int dhdsdio_txpkt(dhd_bus_t *bus, void *pkt, uint chan, bool free_pkt)
 			DHD_INFO(("%s: insufficient headroom %d for %d pad\n",
 				  __func__, (int)PKTHEADROOM(pkt), pad));
 			bus->dhd->tx_realloc++;
-			new = PKTGET(osh, (PKTLEN(pkt) + DHD_SDALIGN), TRUE);
+			new = PKTGET(osh, (PKTLEN(pkt) + DHD_SDALIGN), true);
 			if (!new) {
 				DHD_ERROR(("%s: couldn't allocate new %d-byte "
 					"packet\n",
@@ -942,9 +942,9 @@ static int dhdsdio_txpkt(dhd_bus_t *bus, void *pkt, uint chan, bool free_pkt)
 			PKTALIGN(osh, new, PKTLEN(pkt), DHD_SDALIGN);
 			bcopy(PKTDATA(pkt), PKTDATA(new), PKTLEN(pkt));
 			if (free_pkt)
-				PKTFREE(osh, pkt, TRUE);
+				PKTFREE(osh, pkt, true);
 			/* free the pkt if canned one is not used */
-			free_pkt = TRUE;
+			free_pkt = true;
 			pkt = new;
 			frame = (u8 *) PKTDATA(pkt);
 			ASSERT(((uintptr) frame % DHD_SDALIGN) == 0);
@@ -1055,7 +1055,7 @@ done:
 	dhd_os_sdlock(bus->dhd);
 
 	if (free_pkt)
-		PKTFREE(osh, pkt, TRUE);
+		PKTFREE(osh, pkt, true);
 
 	return ret;
 }
@@ -1106,7 +1106,7 @@ int dhd_bus_txdata(struct dhd_bus *bus, void *pkt)
 		if (dhd_prec_enq(bus->dhd, &bus->txq, pkt, prec) == FALSE) {
 			PKTPULL(pkt, SDPCM_HDRLEN);
 			dhd_txcomplete(bus->dhd, pkt, FALSE);
-			PKTFREE(osh, pkt, TRUE);
+			PKTFREE(osh, pkt, true);
 			DHD_ERROR(("%s: out of bus->txq !!!\n", __func__));
 			ret = BCME_NORESOURCE;
 		} else {
@@ -1123,7 +1123,7 @@ int dhd_bus_txdata(struct dhd_bus *bus, void *pkt)
 #endif
 		/* Schedule DPC if needed to send queued packet(s) */
 		if (dhd_deferred_tx && !bus->dpc_sched) {
-			bus->dpc_sched = TRUE;
+			bus->dpc_sched = true;
 			dhd_sched_dpc(bus->dhd);
 		}
 	} else {
@@ -1133,15 +1133,15 @@ int dhd_bus_txdata(struct dhd_bus *bus, void *pkt)
 		/* Otherwise, send it now */
 		BUS_WAKE(bus);
 		/* Make sure back plane ht clk is on, no pending allowed */
-		dhdsdio_clkctl(bus, CLK_AVAIL, TRUE);
+		dhdsdio_clkctl(bus, CLK_AVAIL, true);
 
 #ifndef SDTEST
 		DHD_TRACE(("%s: calling txpkt\n", __func__));
-		ret = dhdsdio_txpkt(bus, pkt, SDPCM_DATA_CHANNEL, TRUE);
+		ret = dhdsdio_txpkt(bus, pkt, SDPCM_DATA_CHANNEL, true);
 #else
 		ret = dhdsdio_txpkt(bus, pkt,
 				    (bus->ext_loop ? SDPCM_TEST_CHANNEL :
-				     SDPCM_DATA_CHANNEL), TRUE);
+				     SDPCM_DATA_CHANNEL), true);
 #endif
 		if (ret)
 			bus->dhd->tx_errors++;
@@ -1150,7 +1150,7 @@ int dhd_bus_txdata(struct dhd_bus *bus, void *pkt)
 
 		if ((bus->idletime == DHD_IDLE_IMMEDIATE) && !bus->dpc_sched) {
 			bus->activity = FALSE;
-			dhdsdio_clkctl(bus, CLK_NONE, TRUE);
+			dhdsdio_clkctl(bus, CLK_NONE, true);
 		}
 
 		dhd_os_sdunlock(bus->dhd);
@@ -1188,11 +1188,11 @@ static uint dhdsdio_sendfromq(dhd_bus_t *bus, uint maxframes)
 		datalen = PKTLEN(pkt) - SDPCM_HDRLEN;
 
 #ifndef SDTEST
-		ret = dhdsdio_txpkt(bus, pkt, SDPCM_DATA_CHANNEL, TRUE);
+		ret = dhdsdio_txpkt(bus, pkt, SDPCM_DATA_CHANNEL, true);
 #else
 		ret = dhdsdio_txpkt(bus, pkt,
 				    (bus->ext_loop ? SDPCM_TEST_CHANNEL :
-				     SDPCM_DATA_CHANNEL), TRUE);
+				     SDPCM_DATA_CHANNEL), true);
 #endif
 		if (ret)
 			bus->dhd->tx_errors++;
@@ -1207,7 +1207,7 @@ static uint dhdsdio_sendfromq(dhd_bus_t *bus, uint maxframes)
 			if (bcmsdh_regfail(bus->sdh))
 				break;
 			if (intstatus & bus->hostintmask)
-				bus->ipend = TRUE;
+				bus->ipend = true;
 		}
 	}
 
@@ -1291,7 +1291,7 @@ int dhd_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen)
 	if (!DATAOK(bus)) {
 		DHD_INFO(("%s: No bus credit bus->tx_max %d, bus->tx_seq %d\n",
 			  __func__, bus->tx_max, bus->tx_seq));
-		bus->ctrl_frame_stat = TRUE;
+		bus->ctrl_frame_stat = true;
 		/* Send from dpc */
 		bus->ctrl_frame_buf = frame;
 		bus->ctrl_frame_len = len;
@@ -1302,7 +1302,7 @@ int dhd_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen)
 			DHD_INFO(("%s: ctrl_frame_stat == FALSE\n", __func__));
 			ret = 0;
 		} else {
-			DHD_INFO(("%s: ctrl_frame_stat == TRUE\n", __func__));
+			DHD_INFO(("%s: ctrl_frame_stat == true\n", __func__));
 			ret = -1;
 		}
 	}
@@ -1361,7 +1361,7 @@ int dhd_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen)
 
 	if ((bus->idletime == DHD_IDLE_IMMEDIATE) && !bus->dpc_sched) {
 		bus->activity = FALSE;
-		dhdsdio_clkctl(bus, CLK_NONE, TRUE);
+		dhdsdio_clkctl(bus, CLK_NONE, true);
 	}
 
 	dhd_os_sdunlock(bus->dhd);
@@ -1404,7 +1404,7 @@ int dhd_bus_rxctl(struct dhd_bus *bus, unsigned char *msg, uint msglen)
 		dhdsdio_checkdied(bus, NULL, 0);
 		dhd_os_sdunlock(bus->dhd);
 #endif				/* DHD_DEBUG */
-	} else if (pending == TRUE) {
+	} else if (pending == true) {
 		DHD_CTL(("%s: cancelled\n", __func__));
 		return -ERESTARTSYS;
 	} else {
@@ -2114,7 +2114,7 @@ dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, u32 actionid,
 	if (plen >= (int)sizeof(int_val))
 		bcopy(params, &int_val, sizeof(int_val));
 
-	bool_val = (int_val != 0) ? TRUE : FALSE;
+	bool_val = (int_val != 0) ? true : FALSE;
 
 	/* Some ioctls use the bus */
 	dhd_os_sdlock(bus->dhd);
@@ -2498,7 +2498,7 @@ dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, u32 actionid,
 exit:
 	if ((bus->idletime == DHD_IDLE_IMMEDIATE) && !bus->dpc_sched) {
 		bus->activity = FALSE;
-		dhdsdio_clkctl(bus, CLK_NONE, TRUE);
+		dhdsdio_clkctl(bus, CLK_NONE, true);
 	}
 
 	dhd_os_sdunlock(bus->dhd);
@@ -2535,7 +2535,7 @@ static int dhdsdio_write_vars(dhd_bus_t *bus)
 
 		/* Write the vars list */
 		bcmerror =
-		    dhdsdio_membytes(bus, TRUE, varaddr, vbuffer, varsize);
+		    dhdsdio_membytes(bus, true, varaddr, vbuffer, varsize);
 #ifdef DHD_DEBUG
 		/* Verify NVRAM bytes */
 		DHD_INFO(("Compare NVRAM dl & ul; varsize=%d\n", varsize));
@@ -2591,7 +2591,7 @@ static int dhdsdio_write_vars(dhd_bus_t *bus)
 		  varsizew));
 
 	/* Write the length token to the last word */
-	bcmerror = dhdsdio_membytes(bus, TRUE, (bus->orig_ramsize - 4),
+	bcmerror = dhdsdio_membytes(bus, true, (bus->orig_ramsize - 4),
 				    (u8 *)&varsizew, 4);
 
 	return bcmerror;
@@ -2607,7 +2607,7 @@ static int dhdsdio_download_state(dhd_bus_t *bus, bool enter)
 	 */
 	if (enter) {
 
-		bus->alp_only = TRUE;
+		bus->alp_only = true;
 
 		if (!(si_setcore(bus->sih, ARM7S_CORE_ID, 0)) &&
 		    !(si_setcore(bus->sih, ARMCM3_CORE_ID, 0))) {
@@ -2640,7 +2640,7 @@ static int dhdsdio_download_state(dhd_bus_t *bus, bool enter)
 		/* Clear the top bit of memory */
 		if (bus->ramsize) {
 			u32 zeros = 0;
-			dhdsdio_membytes(bus, TRUE, bus->ramsize - 4,
+			dhdsdio_membytes(bus, true, bus->ramsize - 4,
 					 (u8 *)&zeros, 4);
 		}
 	} else {
@@ -2785,7 +2785,7 @@ dhd_bus_iovar_op(dhd_pub_t *dhdp, const char *name,
 
 		if ((bus->idletime == DHD_IDLE_IMMEDIATE) && !bus->dpc_sched) {
 			bus->activity = FALSE;
-			dhdsdio_clkctl(bus, CLK_NONE, TRUE);
+			dhdsdio_clkctl(bus, CLK_NONE, true);
 		}
 
 		dhd_os_sdunlock(bus->dhd);
@@ -2872,7 +2872,7 @@ void dhd_bus_stop(struct dhd_bus *bus, bool enforce_mutex)
 	dhdsdio_clkctl(bus, CLK_SDONLY, FALSE);
 
 	/* Clear the data packet queues */
-	pktq_flush(osh, &bus->txq, TRUE);
+	pktq_flush(osh, &bus->txq, true);
 
 	/* Clear any held glomming stuff */
 	if (bus->glomd)
@@ -3056,7 +3056,7 @@ static void dhdsdio_rxfail(dhd_bus_t *bus, bool abort, bool rtx)
 		W_SDREG(SMB_NAK, &regs->tosbmailbox, retries);
 		bus->f1regdata++;
 		if (retries <= retry_limit)
-			bus->rxskip = TRUE;
+			bus->rxskip = true;
 	}
 
 	/* Clear partial in any case */
@@ -3151,7 +3151,7 @@ dhdsdio_read_control(dhd_bus_t *bus, u8 *hdr, uint len, uint doff)
 		DHD_ERROR(("%s: read %d control bytes failed: %d\n",
 			   __func__, rdlen, sdret));
 		bus->rxc_errors++;	/* dhd.rx_ctlerrs is higher level */
-		dhdsdio_rxfail(bus, TRUE, TRUE);
+		dhdsdio_rxfail(bus, true, true);
 		goto done;
 	}
 
@@ -3340,10 +3340,10 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
 			bus->dhd->rx_errors++;
 
 			if (bus->glomerr++ < 3) {
-				dhdsdio_rxfail(bus, TRUE, TRUE);
+				dhdsdio_rxfail(bus, true, true);
 			} else {
 				bus->glomerr = 0;
-				dhdsdio_rxfail(bus, TRUE, FALSE);
+				dhdsdio_rxfail(bus, true, FALSE);
 				dhd_os_sdlock_rxq(bus->dhd);
 				PKTFREE(osh, bus->glom, FALSE);
 				dhd_os_sdunlock_rxq(bus->dhd);
@@ -3469,10 +3469,10 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
 			if (bus->glomerr++ < 3) {
 				/* Restore superframe header space */
 				PKTPUSH(pfirst, sfdoff);
-				dhdsdio_rxfail(bus, TRUE, TRUE);
+				dhdsdio_rxfail(bus, true, true);
 			} else {
 				bus->glomerr = 0;
-				dhdsdio_rxfail(bus, TRUE, FALSE);
+				dhdsdio_rxfail(bus, true, FALSE);
 				dhd_os_sdlock_rxq(bus->dhd);
 				PKTFREE(osh, bus->glom, FALSE);
 				dhd_os_sdunlock_rxq(bus->dhd);
@@ -3576,7 +3576,7 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
 	return num;
 }
 
-/* Return TRUE if there may be more frames to read */
+/* Return true if there may be more frames to read */
 static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
 {
 	osl_t *osh = bus->dhd->osh;
@@ -3612,7 +3612,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
 	/* Allow pktgen to override maxframes */
 	if (bus->pktgen_count && (bus->pktgen_mode == DHD_PKTGEN_RECV)) {
 		maxframes = bus->pktgen_count;
-		sdtest = TRUE;
+		sdtest = true;
 	}
 #endif
 
@@ -3711,10 +3711,10 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
 						/* dhd.rx_ctlerrs is higher */
 						bus->rxc_errors++;
 						dhd_os_sdunlock_rxq(bus->dhd);
-						dhdsdio_rxfail(bus, TRUE,
+						dhdsdio_rxfail(bus, true,
 						       (bus->bus ==
 							SPI_BUS) ? FALSE
-						       : TRUE);
+						       : true);
 						continue;
 					}
 				} else {
@@ -3729,7 +3729,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
 				}
 			} else {
 				if (bus->bus == SPI_BUS)
-					bus->usebufpool = TRUE;
+					bus->usebufpool = true;
 
 				ASSERT(!PKTLINK(pkt));
 				PKTALIGN(osh, pkt, rdlen, DHD_SDALIGN);
@@ -3754,10 +3754,10 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
 					 * Don't attemp NAK for
 					 * gSPI
 					 */
-					dhdsdio_rxfail(bus, TRUE,
+					dhdsdio_rxfail(bus, true,
 						       (bus->bus ==
 							SPI_BUS) ? FALSE :
-						       TRUE);
+						       true);
 					continue;
 				}
 			}
@@ -3816,9 +3816,9 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
 				dhd_os_sdlock_rxq(bus->dhd);
 				PKTFREE2();
 				dhd_os_sdunlock_rxq(bus->dhd);
-				dhdsdio_rxfail(bus, TRUE,
+				dhdsdio_rxfail(bus, true,
 					       (bus->bus ==
-						SPI_BUS) ? FALSE : TRUE);
+						SPI_BUS) ? FALSE : true);
 				GSPI_PR55150_BAILOUT;
 				continue;
 			}
@@ -3905,7 +3905,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
 						__func__, seq));
 					/* Force retry w/normal header read */
 					bus->nextlen = 0;
-					dhdsdio_rxfail(bus, FALSE, TRUE);
+					dhdsdio_rxfail(bus, FALSE, true);
 					dhd_os_sdlock_rxq(bus->dhd);
 					PKTFREE2();
 					dhd_os_sdunlock_rxq(bus->dhd);
@@ -3950,7 +3950,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
 			DHD_ERROR(("%s: RXHEADER FAILED: %d\n", __func__,
 				   sdret));
 			bus->rx_hdrfail++;
-			dhdsdio_rxfail(bus, TRUE, TRUE);
+			dhdsdio_rxfail(bus, true, true);
 			continue;
 		}
 #ifdef DHD_DEBUG
@@ -3964,7 +3964,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
 
 		/* All zeros means no more frames */
 		if (!(len | check)) {
-			*finished = TRUE;
+			*finished = true;
 			break;
 		}
 
@@ -4124,7 +4124,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished)
 			PKTFREE(bus->dhd->osh, pkt, FALSE);
 			dhd_os_sdunlock_rxq(bus->dhd);
 			bus->dhd->rx_errors++;
-			dhdsdio_rxfail(bus, TRUE, RETRYCHAN(chan));
+			dhdsdio_rxfail(bus, true, RETRYCHAN(chan));
 			continue;
 		}
 
@@ -4291,7 +4291,7 @@ bool dhdsdio_dpc(dhd_bus_t *bus)
 	uint rxlimit = dhd_rxbound;	/* Rx frames to read before resched */
 	uint txlimit = dhd_txbound;	/* Tx frames to send before resched */
 	uint framecnt = 0;	/* Temporary counter of tx/rx frames */
-	bool rxdone = TRUE;	/* Flag for no more read data */
+	bool rxdone = true;	/* Flag for no more read data */
 	bool resched = FALSE;	/* Flag indicating resched wanted */
 
 	DHD_TRACE(("%s: Enter\n", __func__));
@@ -4358,7 +4358,7 @@ bool dhdsdio_dpc(dhd_bus_t *bus)
 	BUS_WAKE(bus);
 
 	/* Make sure backplane clock is on */
-	dhdsdio_clkctl(bus, CLK_AVAIL, TRUE);
+	dhdsdio_clkctl(bus, CLK_AVAIL, true);
 	if (bus->clkstate == CLK_PENDING)
 		goto clkwait;
 
@@ -4520,11 +4520,11 @@ clkwait:
 	} else if (bus->clkstate == CLK_PENDING) {
 		DHD_INFO(("%s: rescheduled due to CLK_PENDING awaiting "
 			"I_CHIPACTIVE interrupt\n", __func__));
-		resched = TRUE;
+		resched = true;
 	} else if (bus->intstatus || bus->ipend ||
 		(!bus->fcstate && pktq_mlen(&bus->txq, ~bus->flowcontrol) &&
 			DATAOK(bus)) || PKT_AVAILABLE()) {
-		resched = TRUE;
+		resched = true;
 	}
 
 	bus->dpc_sched = resched;
@@ -4572,7 +4572,7 @@ void dhdsdio_isr(void *arg)
 	}
 	/* Count the interrupt call */
 	bus->intrcount++;
-	bus->ipend = TRUE;
+	bus->ipend = true;
 
 	/* Shouldn't get this interrupt if we're sleeping? */
 	if (bus->sleeping) {
@@ -4587,14 +4587,14 @@ void dhdsdio_isr(void *arg)
 		DHD_ERROR(("dhdsdio_isr() w/o interrupt configured!\n"));
 
 	bcmsdh_intr_disable(sdh);
-	bus->intdis = TRUE;
+	bus->intdis = true;
 
 #if defined(SDIO_ISR_THREAD)
 	DHD_TRACE(("Calling dhdsdio_dpc() from %s\n", __func__));
 	while (dhdsdio_dpc(bus))
 		;
 #else
-	bus->dpc_sched = TRUE;
+	bus->dpc_sched = true;
 	dhd_sched_dpc(bus->dhd);
 #endif
 
@@ -4642,7 +4642,7 @@ static void dhdsdio_pktgen(dhd_bus_t *bus)
 	/* For recv mode, just make sure dongle has started sending */
 	if (bus->pktgen_mode == DHD_PKTGEN_RECV) {
 		if (!bus->pktgen_rcvd)
-			dhdsdio_sdtest_set(bus, TRUE);
+			dhdsdio_sdtest_set(bus, true);
 		return;
 	}
 
@@ -4659,7 +4659,7 @@ static void dhdsdio_pktgen(dhd_bus_t *bus)
 		len = bus->pktgen_len;
 		pkt = PKTGET(osh,
 			(len + SDPCM_HDRLEN + SDPCM_TEST_HDRLEN + DHD_SDALIGN),
-			TRUE);
+			true);
 		if (!pkt) {
 			DHD_ERROR(("%s: PKTGET failed!\n", __func__));
 			break;
@@ -4688,7 +4688,7 @@ static void dhdsdio_pktgen(dhd_bus_t *bus)
 		default:
 			DHD_ERROR(("Unrecognized pktgen mode %d\n",
 				   bus->pktgen_mode));
-			PKTFREE(osh, pkt, TRUE);
+			PKTFREE(osh, pkt, true);
 			bus->pktgen_count = 0;
 			return;
 		}
@@ -4712,7 +4712,7 @@ static void dhdsdio_pktgen(dhd_bus_t *bus)
 #endif
 
 		/* Send it */
-		if (dhdsdio_txpkt(bus, pkt, SDPCM_TEST_CHANNEL, TRUE)) {
+		if (dhdsdio_txpkt(bus, pkt, SDPCM_TEST_CHANNEL, true)) {
 			bus->pktgen_fail++;
 			if (bus->pktgen_stop
 			    && bus->pktgen_stop == bus->pktgen_fail)
@@ -4738,7 +4738,7 @@ static void dhdsdio_sdtest_set(dhd_bus_t *bus, bool start)
 
 	/* Allocate the packet */
 	pkt = PKTGET(osh, SDPCM_HDRLEN + SDPCM_TEST_HDRLEN + DHD_SDALIGN,
-			TRUE);
+			true);
 	if (!pkt) {
 		DHD_ERROR(("%s: PKTGET failed!\n", __func__));
 		return;
@@ -4753,7 +4753,7 @@ static void dhdsdio_sdtest_set(dhd_bus_t *bus, bool start)
 	*data++ = (bus->pktgen_maxlen >> 8);
 
 	/* Send it */
-	if (dhdsdio_txpkt(bus, pkt, SDPCM_TEST_CHANNEL, TRUE))
+	if (dhdsdio_txpkt(bus, pkt, SDPCM_TEST_CHANNEL, true))
 		bus->pktgen_fail++;
 }
 
@@ -4802,7 +4802,7 @@ static void dhdsdio_testrcv(dhd_bus_t *bus, void *pkt, uint seq)
 		/* Rx->Tx turnaround ok (even on NDIS w/current
 			 implementation) */
 		*(u8 *) (PKTDATA(pkt)) = SDPCM_TEST_ECHORSP;
-		if (dhdsdio_txpkt(bus, pkt, SDPCM_TEST_CHANNEL, TRUE) == 0) {
+		if (dhdsdio_txpkt(bus, pkt, SDPCM_TEST_CHANNEL, true) == 0) {
 			bus->pktgen_sent++;
 		} else {
 			bus->pktgen_fail++;
@@ -4897,11 +4897,11 @@ extern bool dhd_bus_watchdog(dhd_pub_t *dhdp)
 				 schedule the DPC */
 			if (intstatus) {
 				bus->pollcnt++;
-				bus->ipend = TRUE;
+				bus->ipend = true;
 				if (bus->intr)
 					bcmsdh_intr_disable(bus->sdh);
 
-				bus->dpc_sched = TRUE;
+				bus->dpc_sched = true;
 				dhd_sched_dpc(bus->dhd);
 
 			}
@@ -4982,34 +4982,34 @@ extern int dhd_bus_console_in(dhd_pub_t *dhdp, unsigned char *msg, uint msglen)
 	/* Zero cbuf_index */
 	addr = bus->console_addr + offsetof(hndrte_cons_t, cbuf_idx);
 	val = htol32(0);
-	rv = dhdsdio_membytes(bus, TRUE, addr, (u8 *)&val, sizeof(val));
+	rv = dhdsdio_membytes(bus, true, addr, (u8 *)&val, sizeof(val));
 	if (rv < 0)
 		goto done;
 
 	/* Write message into cbuf */
 	addr = bus->console_addr + offsetof(hndrte_cons_t, cbuf);
-	rv = dhdsdio_membytes(bus, TRUE, addr, (u8 *)msg, msglen);
+	rv = dhdsdio_membytes(bus, true, addr, (u8 *)msg, msglen);
 	if (rv < 0)
 		goto done;
 
 	/* Write length into vcons_in */
 	addr = bus->console_addr + offsetof(hndrte_cons_t, vcons_in);
 	val = htol32(msglen);
-	rv = dhdsdio_membytes(bus, TRUE, addr, (u8 *)&val, sizeof(val));
+	rv = dhdsdio_membytes(bus, true, addr, (u8 *)&val, sizeof(val));
 	if (rv < 0)
 		goto done;
 
 	/* Bump dongle by sending an empty event pkt.
 	 * sdpcm_sendup (RX) checks for virtual console input.
 	 */
-	pkt = PKTGET(bus->dhd->osh, 4 + SDPCM_RESERVE, TRUE);
+	pkt = PKTGET(bus->dhd->osh, 4 + SDPCM_RESERVE, true);
 	if ((pkt != NULL) && bus->clkstate == CLK_AVAIL)
-		dhdsdio_txpkt(bus, pkt, SDPCM_EVENT_CHANNEL, TRUE);
+		dhdsdio_txpkt(bus, pkt, SDPCM_EVENT_CHANNEL, true);
 
 done:
 	if ((bus->idletime == DHD_IDLE_IMMEDIATE) && !bus->dpc_sched) {
 		bus->activity = FALSE;
-		dhdsdio_clkctl(bus, CLK_NONE, TRUE);
+		dhdsdio_clkctl(bus, CLK_NONE, true);
 	}
 
 	dhd_os_sdunlock(bus->dhd);
@@ -5050,11 +5050,11 @@ static void dhd_dump_cis(uint fn, u8 *cis)
 static bool dhdsdio_chipmatch(u16 chipid)
 {
 	if (chipid == BCM4325_CHIP_ID)
-		return TRUE;
+		return true;
 	if (chipid == BCM4329_CHIP_ID)
-		return TRUE;
+		return true;
 	if (chipid == BCM4319_CHIP_ID)
-		return TRUE;
+		return true;
 	return FALSE;
 }
 
@@ -5075,15 +5075,15 @@ static void *dhdsdio_probe(u16 venid, u16 devid, u16 bus_no,
 	 */
 	dhd_txbound = DHD_TXBOUND;
 	dhd_rxbound = DHD_RXBOUND;
-	dhd_alignctl = TRUE;
-	sd1idle = TRUE;
-	dhd_readahead = TRUE;
+	dhd_alignctl = true;
+	sd1idle = true;
+	dhd_readahead = true;
 	retrydata = FALSE;
 	dhd_doflow = FALSE;
 	dhd_dongle_memsize = 0;
 	dhd_txminmax = DHD_TXMINMAX;
 
-	forcealign = TRUE;
+	forcealign = true;
 
 	dhd_common_init();
 
@@ -5226,7 +5226,7 @@ dhdsdio_probe_attach(struct dhd_bus *bus, osl_t *osh, void *sdh, void *regsva,
 	u8 clkctl = 0;
 	int err = 0;
 
-	bus->alp_only = TRUE;
+	bus->alp_only = true;
 
 	/* Return the window to backplane enumeration space for core access */
 	if (dhdsdio_set_siaddr_window(bus, SI_ENUM_BASE))
@@ -5372,7 +5372,7 @@ dhdsdio_probe_attach(struct dhd_bus *bus, osl_t *osh, void *sdh, void *regsva,
 	if (bus->poll)
 		bus->pollrate = 1;
 
-	return TRUE;
+	return true;
 
 fail:
 	return FALSE;
@@ -5434,7 +5434,7 @@ static bool dhdsdio_probe_malloc(dhd_bus_t *bus, osl_t *osh, void *sdh)
 	else
 		bus->dataptr = bus->databuf;
 
-	return TRUE;
+	return true;
 
 fail:
 	return FALSE;
@@ -5513,7 +5513,7 @@ static bool dhdsdio_probe_init(dhd_bus_t *bus, osl_t *osh, void *sdh)
 	}
 	bus->use_rxchain = (bool) bus->sd_rxchain;
 
-	return TRUE;
+	return true;
 }
 
 bool
@@ -5669,7 +5669,7 @@ static int dhdsdio_download_code_array(struct dhd_bus *bus)
 	/* Download image */
 	while ((offset + MEMBLOCK) < sizeof(dlarray)) {
 		bcmerror =
-		    dhdsdio_membytes(bus, TRUE, offset, dlarray + offset,
+		    dhdsdio_membytes(bus, true, offset, dlarray + offset,
 				     MEMBLOCK);
 		if (bcmerror) {
 			DHD_ERROR(("%s: error %d on writing %d membytes at "
@@ -5682,7 +5682,7 @@ static int dhdsdio_download_code_array(struct dhd_bus *bus)
 	}
 
 	if (offset < sizeof(dlarray)) {
-		bcmerror = dhdsdio_membytes(bus, TRUE, offset,
+		bcmerror = dhdsdio_membytes(bus, true, offset,
 					    dlarray + offset,
 					    sizeof(dlarray) - offset);
 		if (bcmerror) {
@@ -5772,7 +5772,7 @@ static int dhdsdio_download_code_file(struct dhd_bus *bus, char *fw_path)
 	/* Download image */
 	while ((len =
 		dhd_os_get_image_block((char *)memptr, MEMBLOCK, image))) {
-		bcmerror = dhdsdio_membytes(bus, TRUE, offset, memptr, len);
+		bcmerror = dhdsdio_membytes(bus, true, offset, memptr, len);
 		if (bcmerror) {
 			DHD_ERROR(("%s: error %d on writing %d membytes at "
 			"0x%08x\n", __func__, bcmerror, MEMBLOCK, offset));
@@ -5822,7 +5822,7 @@ static uint process_nvram_vars(char *varbuf, uint len)
 			continue;
 		findNewline = FALSE;
 		if (varbuf[n] == '#') {
-			findNewline = TRUE;
+			findNewline = true;
 			continue;
 		}
 		if (varbuf[n] == '\n') {
@@ -5942,14 +5942,14 @@ static int _dhdsdio_download_firmware(struct dhd_bus *bus)
 	/* Out immediately if no image to download */
 	if ((bus->fw_path == NULL) || (bus->fw_path[0] == '\0')) {
 #ifdef BCMEMBEDIMAGE
-		embed = TRUE;
+		embed = true;
 #else
 		return bcmerror;
 #endif
 	}
 
 	/* Keep arm in reset */
-	if (dhdsdio_download_state(bus, TRUE)) {
+	if (dhdsdio_download_state(bus, true)) {
 		DHD_ERROR(("%s: error placing ARM core in reset\n", __func__));
 		goto err;
 	}
@@ -5960,13 +5960,13 @@ static int _dhdsdio_download_firmware(struct dhd_bus *bus)
 			DHD_ERROR(("%s: dongle image file download failed\n",
 				   __func__));
 #ifdef BCMEMBEDIMAGE
-			embed = TRUE;
+			embed = true;
 #else
 			goto err;
 #endif
 		} else {
 			embed = FALSE;
-			dlok = TRUE;
+			dlok = true;
 		}
 	}
 #ifdef BCMEMBEDIMAGE
@@ -5976,7 +5976,7 @@ static int _dhdsdio_download_firmware(struct dhd_bus *bus)
 				   __func__));
 			goto err;
 		} else {
-			dlok = TRUE;
+			dlok = true;
 		}
 	}
 #endif
@@ -6061,7 +6061,7 @@ int dhd_bus_devreset(dhd_pub_t *dhdp, u8 flag)
 
 	bus = dhdp->bus;
 
-	if (flag == TRUE) {
+	if (flag == true) {
 		if (!bus->dhd->dongle_reset) {
 			/* Expect app to have torn down any
 			 connection before calling */
@@ -6072,7 +6072,7 @@ int dhd_bus_devreset(dhd_pub_t *dhdp, u8 flag)
 			 detach from the dongle */
 			dhdsdio_release_dongle(bus, bus->dhd->osh);
 
-			bus->dhd->dongle_reset = TRUE;
+			bus->dhd->dongle_reset = true;
 			bus->dhd->up = FALSE;
 
 			DHD_TRACE(("%s:  WLAN OFF DONE\n", __func__));
@@ -6105,11 +6105,11 @@ int dhd_bus_devreset(dhd_pub_t *dhdp, u8 flag)
 						     FALSE);
 
 #if defined(OOB_INTR_ONLY)
-					dhd_enable_oob_intr(bus, TRUE);
+					dhd_enable_oob_intr(bus, true);
 #endif				/* defined(OOB_INTR_ONLY) */
 
 					bus->dhd->dongle_reset = FALSE;
-					bus->dhd->up = TRUE;
+					bus->dhd->up = true;
 
 					DHD_TRACE(("%s: WLAN ON DONE\n",
 						   __func__));
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 988330e..d05c86d 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -750,7 +750,7 @@ static s32 wl_do_iscan(struct wl_priv *wl)
 		}
 	}
 	wl_set_mpc(ndev, 0);
-	wl->iscan_kickstart = TRUE;
+	wl->iscan_kickstart = true;
 	wl_run_iscan(iscan, &ssid, WL_SCAN_ACTION_START);
 	mod_timer(&iscan->timer, jiffies + iscan->timer_ms * HZ / 1000);
 	iscan->timer_on = 1;
@@ -793,7 +793,7 @@ __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
 							 * we do not iscan for
 							 * specific scan request
 							 */
-			iscan_req = TRUE;
+			iscan_req = true;
 		}
 	} else {		/* scan in ibss */
 		/* we don't do iscan in ibss */
@@ -818,7 +818,7 @@ __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
 			sr->ssid.SSID_len = htod32(sr->ssid.SSID_len);
 			WL_DBG(("Specific scan ssid=\"%s\" len=%d\n",
 					sr->ssid.SSID, sr->ssid.SSID_len));
-			spec_scan = TRUE;
+			spec_scan = true;
 		} else {
 			WL_DBG(("Broadcast scan\n"));
 		}
@@ -977,7 +977,7 @@ static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)
 	if (changed & WIPHY_PARAM_RETRY_LONG
 	    && (wl->conf->retry_long != wiphy->retry_long)) {
 		wl->conf->retry_long = wiphy->retry_long;
-		err = wl_set_retry(ndev, wl->conf->retry_long, TRUE);
+		err = wl_set_retry(ndev, wl->conf->retry_long, true);
 		if (!err)
 			return err;
 	}
@@ -1035,7 +1035,7 @@ wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
 		wl->ibss_starter = FALSE;
 		WL_DBG(("Found IBSS\n"));
 	} else {
-		wl->ibss_starter = TRUE;
+		wl->ibss_starter = true;
 	}
 	chan = params->channel;
 	if (chan)
@@ -1574,7 +1574,7 @@ wl_add_keyext(struct wiphy *wiphy, struct net_device *dev,
 			key.rxiv.hi = (ivptr[5] << 24) | (ivptr[4] << 16) |
 			    (ivptr[3] << 8) | ivptr[2];
 			key.rxiv.lo = (ivptr[1] << 8) | ivptr[0];
-			key.iv_initialized = TRUE;
+			key.iv_initialized = true;
 		}
 
 		switch (params->cipher) {
@@ -1991,7 +1991,7 @@ static s32 wl_cfg80211_suspend(struct wiphy *wiphy)
 	set_bit(WL_STATUS_SCAN_ABORTING, &wl->status);
 	wl_term_iscan(wl);
 	if (wl->scan_request) {
-		cfg80211_scan_done(wl->scan_request, TRUE);	/* TRUE means
+		cfg80211_scan_done(wl->scan_request, true);	/* true means
 								 abort */
 		wl_set_mpc(ndev, 1);
 		wl->scan_request = NULL;
@@ -2339,7 +2339,7 @@ static bool wl_is_linkup(struct wl_priv *wl, const wl_event_msg_t *e)
 				if (wl_is_ibssstarter(wl)) {
 				}
 			} else {
-				return TRUE;
+				return true;
 			}
 		}
 	}
@@ -2353,10 +2353,10 @@ static bool wl_is_linkdown(struct wl_priv *wl, const wl_event_msg_t *e)
 	u16 flags = ntoh16(e->flags);
 
 	if (event == WLC_E_DEAUTH_IND || event == WLC_E_DISASSOC_IND) {
-		return TRUE;
+		return true;
 	} else if (event == WLC_E_LINK) {
 		if (!(flags & WLC_EVENT_MSG_LINK))
-			return TRUE;
+			return true;
 	}
 
 	return FALSE;
@@ -2369,7 +2369,7 @@ static bool wl_is_nonetwork(struct wl_priv *wl, const wl_event_msg_t *e)
 
 	if (event == WLC_E_SET_SSID || event == WLC_E_LINK) {
 		if (status == WLC_E_STATUS_NO_NETWORKS)
-			return TRUE;
+			return true;
 	}
 
 	return FALSE;
@@ -2389,12 +2389,12 @@ wl_notify_connect_status(struct wl_priv *wl, struct net_device *ndev,
 					     GFP_KERNEL);
 			WL_DBG(("joined in IBSS network\n"));
 		} else {
-			wl_bss_connect_done(wl, ndev, e, data, TRUE);
+			wl_bss_connect_done(wl, ndev, e, data, true);
 			WL_DBG(("joined in BSS network \"%s\"\n",
 				((struct wlc_ssid *)
 				 wl_read_prof(wl, WL_PROF_SSID))->SSID));
 		}
-		act = TRUE;
+		act = true;
 		wl_update_prof(wl, e, &act, WL_PROF_ACT);
 	} else if (wl_is_linkdown(wl, e)) {
 		cfg80211_disconnected(ndev, 0, NULL, 0, GFP_KERNEL);
@@ -2416,7 +2416,7 @@ wl_notify_roaming_status(struct wl_priv *wl, struct net_device *ndev,
 	s32 err = 0;
 
 	wl_bss_roaming_done(wl, ndev, e, data);
-	act = TRUE;
+	act = true;
 	wl_update_prof(wl, e, &act, WL_PROF_ACT);
 
 	return err;
@@ -2978,7 +2978,7 @@ static s32 wl_iscan_aborted(struct wl_priv *wl)
 
 	iscan->state = WL_ISCAN_STATE_IDLE;
 	rtnl_lock();
-	wl_notify_iscan_complete(iscan, TRUE);
+	wl_notify_iscan_complete(iscan, true);
 	rtnl_unlock();
 
 	return err;
@@ -3099,20 +3099,20 @@ static s32 wl_init_priv(struct wl_priv *wl)
 	wl->scan_request = NULL;
 	wl->pwr_save = !!(wiphy->flags & WIPHY_FLAG_PS_ON_BY_DEFAULT);
 #ifndef WL_ISCAN_DISABLED
-	wl->iscan_on = TRUE;	/* iscan on & off switch.
+	wl->iscan_on = true;	/* iscan on & off switch.
 				 we enable iscan per default */
 #else
 	wl->iscan_on = FALSE;
 #endif				/* WL_ISCAN_DISABLED */
 #ifndef WL_ROAM_DISABLED
-	wl->roam_on = TRUE;	/* roam on & off switch.
+	wl->roam_on = true;	/* roam on & off switch.
 				 we enable roam per default */
 #else
 	wl->roam_on = FALSE;
 #endif				/* WL_ROAM_DISABLED */
 
 	wl->iscan_kickstart = FALSE;
-	wl->active_scan = TRUE;	/* we do active scan for
+	wl->active_scan = true;	/* we do active scan for
 				 specific scan per default */
 	wl->dongle_up = FALSE;	/* dongle is not up yet */
 	wl_init_eq(wl);
@@ -3742,7 +3742,7 @@ default_conf_out:
 	if (need_lock)
 		rtnl_unlock();
 
-	wl->dongle_up = TRUE;
+	wl->dongle_up = true;
 
 	return err;
 
@@ -3797,7 +3797,7 @@ static s32 __wl_cfg80211_down(struct wl_priv *wl)
 	set_bit(WL_STATUS_SCAN_ABORTING, &wl->status);
 	wl_term_iscan(wl);
 	if (wl->scan_request) {
-		cfg80211_scan_done(wl->scan_request, TRUE);	/* TRUE
+		cfg80211_scan_done(wl->scan_request, true);	/* true
 								 means abort */
 		wl_set_mpc(ndev, 1);
 		wl->scan_request = NULL;
@@ -3982,7 +3982,7 @@ static u32 wl_get_ielen(struct wl_priv *wl)
 
 static void wl_link_up(struct wl_priv *wl)
 {
-	wl->link_up = TRUE;
+	wl->link_up = true;
 }
 
 static void wl_link_down(struct wl_priv *wl)
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
index 0934409..3ee4b54 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
@@ -57,7 +57,7 @@ typedef const struct si_pub si_t;
 #define WL_IW_USE_ISCAN  1
 #define ENABLE_ACTIVE_PASSIVE_SCAN_SUPPRESS  1
 
-bool g_set_essid_before_scan = TRUE;
+bool g_set_essid_before_scan = true;
 
 #define WL_IW_IOCTL_CALL(func_call) \
 	do {				\
@@ -1189,7 +1189,7 @@ static int _iscan_sysioc_thread(void *data)
 		rtnl_lock();
 		status = wl_iw_iscan_get(iscan);
 		rtnl_unlock();
-		if (g_scan_specified_ssid && (iscan_pass_abort == TRUE)) {
+		if (g_scan_specified_ssid && (iscan_pass_abort == true)) {
 			WL_TRACE(("%s Get results from specific scan "
 				"status = %d\n", __func__, status));
 			wl_iw_send_scan_complete(iscan);
@@ -1224,7 +1224,7 @@ static int _iscan_sysioc_thread(void *data)
 			if (g_scan_specified_ssid == 0)
 				wl_iw_send_scan_complete(iscan);
 			else {
-				iscan_pass_abort = TRUE;
+				iscan_pass_abort = true;
 				wl_iw_force_specific_scan(iscan);
 			}
 			break;
@@ -1407,7 +1407,7 @@ static bool ie_is_wpa_ie(u8 **wpaie, u8 **tlvs, int *tlvs_len)
 
 	if ((ie[1] >= 6) &&
 	    !bcmp((const void *)&ie[2], (const void *)(WPA_OUI "\x01"), 4)) {
-		return TRUE;
+		return true;
 	}
 
 	ie += ie[1] + 2;
@@ -1423,7 +1423,7 @@ static bool ie_is_wps_ie(u8 **wpsie, u8 **tlvs, int *tlvs_len)
 
 	if ((ie[1] >= 4) &&
 	    !bcmp((const void *)&ie[2], (const void *)(WPA_OUI "\x04"), 4)) {
-		return TRUE;
+		return true;
 	}
 
 	ie += ie[1] + 2;
@@ -2590,7 +2590,7 @@ wl_iw_set_encodeext(struct net_device *dev,
 			key.rxiv.hi = (ivptr[5] << 24) | (ivptr[4] << 16) |
 			    (ivptr[3] << 8) | ivptr[2];
 			key.rxiv.lo = (ivptr[1] << 8) | ivptr[0];
-			key.iv_initialized = TRUE;
+			key.iv_initialized = true;
 		}
 
 		switch (iwe->alg) {
@@ -2797,11 +2797,11 @@ wl_iw_set_wpaauth(struct net_device *dev,
 		}
 
 		if (iw->privacy_invoked && !val) {
-			WL_WSEC(("%s: %s: 'Privacy invoked' TRUE but clearing "
+			WL_WSEC(("%s: %s: 'Privacy invoked' true but clearing "
 				"wsec, assuming " "we're a WPS enrollee\n",
 				dev->name, __func__));
 			error = dev_wlc_intvar_set(dev, "is_WPS_enrollee",
-							TRUE);
+							true);
 			if (error) {
 				WL_WSEC(("Failed to set is_WPS_enrollee\n"));
 				return error;
@@ -2913,7 +2913,7 @@ wl_iw_set_wpaauth(struct net_device *dev,
 					return error;
 				}
 			} else {
-				iw->privacy_invoked = TRUE;
+				iw->privacy_invoked = true;
 				error = dev_wlc_intvar_get(dev, "wsec", &wsec);
 				if (error)
 					return error;
@@ -2921,7 +2921,7 @@ wl_iw_set_wpaauth(struct net_device *dev,
 				if (!(IW_WSEC_ENABLED(wsec))) {
 					error = dev_wlc_intvar_set(dev,
 							"is_WPS_enrollee",
-							TRUE);
+							true);
 					if (error) {
 						WL_WSEC(("Failed to set iovar "
 						"is_WPS_enrollee\n"));
@@ -3034,7 +3034,7 @@ wl_iw_get_wpaauth(struct net_device *dev,
 		if (error)
 			return error;
 		if (val)
-			paramval = TRUE;
+			paramval = true;
 		else
 			paramval = FALSE;
 		break;
@@ -3340,7 +3340,7 @@ wl_iw_conn_status_str(u32 event_type, u32 status, u32 reason,
 		snprintf(stringBuf, buflen, "%s %s %02d %02d",
 			 name, cause, status, reason);
 		WL_INFORM(("Connection status: %s\n", stringBuf));
-		return TRUE;
+		return true;
 	} else {
 		return FALSE;
 	}
@@ -3356,7 +3356,7 @@ wl_iw_check_conn_fail(wl_event_msg_t *e, char *stringBuf, uint buflen)
 	u32 reason = ntoh32(e->reason);
 
 	if (wl_iw_conn_status_str(event, status, reason, stringBuf, buflen)) {
-		return TRUE;
+		return true;
 	} else
 		return FALSE;
 }