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>
diff --git a/drivers/staging/brcm80211/util/aiutils.c b/drivers/staging/brcm80211/util/aiutils.c
index 92573ab..0724cc1 100644
--- a/drivers/staging/brcm80211/util/aiutils.c
+++ b/drivers/staging/brcm80211/util/aiutils.c
@@ -153,7 +153,7 @@
uint i, j, idx;
bool br;
- br = FALSE;
+ br = false;
/* Grok a component */
cia = get_erom_ent(sih, &eromptr, ER_TAG, ER_CI);
@@ -493,7 +493,7 @@
u32 *r = NULL;
uint w;
uint intr_val = 0;
- bool fast = FALSE;
+ bool fast = false;
si_info_t *sii;
sii = SI_INFO(sih);
diff --git a/drivers/staging/brcm80211/util/bcmotp.c b/drivers/staging/brcm80211/util/bcmotp.c
index fedebe2..91f70e4 100644
--- a/drivers/staging/brcm80211/util/bcmotp.c
+++ b/drivers/staging/brcm80211/util/bcmotp.c
@@ -930,7 +930,7 @@
int
otp_read_region(si_t *sih, int region, u16 *data,
uint *wlen) {
- bool wasup = FALSE;
+ bool wasup = false;
void *oh;
int err = 0;
@@ -953,7 +953,7 @@
out:
if (!wasup)
- si_otp_power(sih, FALSE);
+ si_otp_power(sih, false);
return err;
}
diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/util/bcmsrom.c
index 13fe173..d029fa4 100644
--- a/drivers/staging/brcm80211/util/bcmsrom.c
+++ b/drivers/staging/brcm80211/util/bcmsrom.c
@@ -385,7 +385,7 @@
varbuf_t b;
u8 *cis, tup, tlen, sromrev = 1;
int i, j;
- bool ag_init = FALSE;
+ bool ag_init = false;
u32 w32;
uint funcid;
uint cisnum;
@@ -692,7 +692,7 @@
* after this tuple
*/
tlen++;
- standard_cis = FALSE;
+ standard_cis = false;
break;
case HNBU_USBEPNUM:
@@ -1388,7 +1388,7 @@
}
/* if there is no antenna gain field, set default */
- if (getvar(NULL, "ag0") == NULL && ag_init == FALSE) {
+ if (getvar(NULL, "ag0") == NULL && ag_init == false) {
varbuf_append(&b, vstr_ag, 0, 0xff);
}
@@ -1850,7 +1850,7 @@
varbuf_t b;
char *vp, *base = NULL;
osl_t *osh = si_osh(sih);
- bool flash = FALSE;
+ bool flash = false;
int err = 0;
/*
diff --git a/drivers/staging/brcm80211/util/bcmwifi.c b/drivers/staging/brcm80211/util/bcmwifi.c
index 83e7e1e..b83b12f 100644
--- a/drivers/staging/brcm80211/util/bcmwifi.c
+++ b/drivers/staging/brcm80211/util/bcmwifi.c
@@ -46,7 +46,7 @@
return true;
}
- return FALSE;
+ return false;
}
/*
diff --git a/drivers/staging/brcm80211/util/bcmwpa.c b/drivers/staging/brcm80211/util/bcmwpa.c
index 870ae4b..44aaa66 100644
--- a/drivers/staging/brcm80211/util/bcmwpa.c
+++ b/drivers/staging/brcm80211/util/bcmwpa.c
@@ -40,7 +40,7 @@
/* update the pointer to the start of the buffer */
*tlvs = ie;
- return FALSE;
+ return false;
}
wpa_ie_fixed_t *BCMROMFN(bcm_find_wpaie) (u8 * parse, uint len)
diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c
index 66c5609..716ef25 100644
--- a/drivers/staging/brcm80211/util/hnddma.c
+++ b/drivers/staging/brcm80211/util/hnddma.c
@@ -169,7 +169,7 @@
#ifdef BCMDMASGLISTOSL
#define DMASGLIST_ENAB true
#else
-#define DMASGLIST_ENAB FALSE
+#define DMASGLIST_ENAB false
#endif /* BCMDMASGLISTOSL */
/* descriptor bumping macros */
@@ -758,18 +758,18 @@
W_REG(di->osh, &di->d64txregs->addrlow, 0xff0);
addrl = R_REG(di->osh, &di->d64txregs->addrlow);
if (addrl != 0)
- return FALSE;
+ return false;
} else if (di->d64rxregs != NULL) {
W_REG(di->osh, &di->d64rxregs->addrlow, 0xff0);
addrl = R_REG(di->osh, &di->d64rxregs->addrlow);
if (addrl != 0)
- return FALSE;
+ return false;
}
}
return true;
}
-/* return true if this dma engine supports DmaExtendedAddrChanges, otherwise FALSE */
+/* return true if this dma engine supports DmaExtendedAddrChanges, otherwise false */
static bool _dma_isaddrext(dma_info_t *di)
{
if (DMA64_ENAB(di) && DMA64_MODE(di)) {
@@ -789,7 +789,7 @@
}
return true;
}
- return FALSE;
+ return false;
} else if (DMA32_ENAB(di)) {
if (di->d32txregs)
return _dma32_addrext(di->osh, di->d32txregs);
@@ -798,7 +798,7 @@
} else
ASSERT(0);
- return FALSE;
+ return false;
}
/* initialize descriptor table base address */
@@ -994,7 +994,7 @@
int resid = 0;
next_frame:
- head = _dma_getnextrxp(di, FALSE);
+ head = _dma_getnextrxp(di, false);
if (head == NULL)
return NULL;
@@ -1018,7 +1018,7 @@
/* check for single or multi-buffer rx */
if (resid > 0) {
tail = head;
- while ((resid > 0) && (p = _dma_getnextrxp(di, FALSE))) {
+ while ((resid > 0) && (p = _dma_getnextrxp(di, false))) {
PKTSETNEXT(tail, p);
pkt_len = min(resid, (int)di->rxbufsize);
PKTSETLEN(p, pkt_len);
@@ -1047,7 +1047,7 @@
if ((di->hnddma.dmactrlflags & DMA_CTRL_RXMULTI) == 0) {
DMA_ERROR(("%s: dma_rx: bad frame length (%d)\n",
di->name, len));
- PKTFREE(di->osh, head, FALSE);
+ PKTFREE(di->osh, head, false);
di->hnddma.rxgiants++;
goto next_frame;
}
@@ -1057,7 +1057,7 @@
}
/* post receive buffers
- * return FALSE is refill failed completely and ring is empty
+ * return false is refill failed completely and ring is empty
* this will stall the rx dma and user might want to call rxfill again asap
* This unlikely happens on memory-rich NIC, but often on memory-constrained dongle
*/
@@ -1072,7 +1072,7 @@
uint extra_offset = 0;
bool ring_empty;
- ring_empty = FALSE;
+ ring_empty = false;
/*
* Determine how many receive buffers we're lacking
@@ -1238,7 +1238,7 @@
DMA_TRACE(("%s: dma_rxreclaim\n", di->name));
while ((p = _dma_getnextrxp(di, true)))
- PKTFREE(di->osh, p, FALSE);
+ PKTFREE(di->osh, p, false);
}
static void *BCMFASTPATH _dma_getnextrxp(dma_info_t *di, bool forceall)
@@ -1538,7 +1538,7 @@
&alloced, &di->txdpaorig, &di->tx_dmah);
if (va == NULL) {
DMA_ERROR(("%s: dma_alloc: DMA_ALLOC_CONSISTENT(ntxd) failed\n", di->name));
- return FALSE;
+ return false;
}
PHYSADDRHISET(di->txdpa, 0);
@@ -1559,7 +1559,7 @@
&alloced, &di->rxdpaorig, &di->rx_dmah);
if (va == NULL) {
DMA_ERROR(("%s: dma_alloc: DMA_ALLOC_CONSISTENT(nrxd) failed\n", di->name));
- return FALSE;
+ return false;
}
PHYSADDRHISET(di->rxdpa, 0);
@@ -2106,7 +2106,7 @@
&alloced, &di->txdpaorig, &di->tx_dmah);
if (va == NULL) {
DMA_ERROR(("%s: dma64_alloc: DMA_ALLOC_CONSISTENT(ntxd) failed\n", di->name));
- return FALSE;
+ return false;
}
align = (1 << align_bits);
di->txd64 = (dma64dd_t *) roundup((uintptr) va, align);
@@ -2124,7 +2124,7 @@
&alloced, &di->rxdpaorig, &di->rx_dmah);
if (va == NULL) {
DMA_ERROR(("%s: dma64_alloc: DMA_ALLOC_CONSISTENT(nrxd) failed\n", di->name));
- return FALSE;
+ return false;
}
align = (1 << align_bits);
di->rxd64 = (dma64dd_t *) roundup((uintptr) va, align);
diff --git a/drivers/staging/brcm80211/util/hndpmu.c b/drivers/staging/brcm80211/util/hndpmu.c
index cd71b74..8ffb235 100644
--- a/drivers/staging/brcm80211/util/hndpmu.c
+++ b/drivers/staging/brcm80211/util/hndpmu.c
@@ -152,7 +152,7 @@
mask = 0xf;
break;
default:
- ASSERT(FALSE);
+ ASSERT(false);
return;
}
break;
@@ -164,12 +164,12 @@
mask = 0x1f;
break;
default:
- ASSERT(FALSE);
+ ASSERT(false);
break;
}
break;
default:
- ASSERT(FALSE);
+ ASSERT(false);
return;
}
@@ -2021,7 +2021,7 @@
up = (R_REG(osh, &cc->res_updn_timer) >> 8) & 0xff;
/* direct dependancies of resource 'rsrc' */
- deps = si_pmu_res_deps(sih, osh, cc, PMURES_BIT(rsrc), FALSE);
+ deps = si_pmu_res_deps(sih, osh, cc, PMURES_BIT(rsrc), false);
for (i = 0; i <= PMURES_MAX_RESNUM; i++) {
if (!(deps & PMURES_BIT(i)))
continue;
@@ -2535,7 +2535,7 @@
#endif /* CHIPC_UART_ALWAYS_ON */
/* Gate off SPROM clock and chip select signals */
- si_pmu_sprom_enable(sih, osh, FALSE);
+ si_pmu_sprom_enable(sih, osh, false);
/* Remember original core */
origidx = si_coreidx(sih);
diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c
index a139232..0ae9fbc 100644
--- a/drivers/staging/brcm80211/util/linux_osl.c
+++ b/drivers/staging/brcm80211/util/linux_osl.c
@@ -167,10 +167,10 @@
case USB_BUS:
case SPI_BUS:
case RPC_BUS:
- osh->pub.mmbus = FALSE;
+ osh->pub.mmbus = false;
break;
default:
- ASSERT(FALSE);
+ ASSERT(false);
break;
}
diff --git a/drivers/staging/brcm80211/util/nicpci.c b/drivers/staging/brcm80211/util/nicpci.c
index 6a9d9d6..36696f1 100644
--- a/drivers/staging/brcm80211/util/nicpci.c
+++ b/drivers/staging/brcm80211/util/nicpci.c
@@ -287,7 +287,7 @@
if (i >= pcie_serdes_spinwait) {
PCI_ERROR(("pcie_mdiosetblock: timed out\n"));
- return FALSE;
+ return false;
}
return true;
@@ -356,7 +356,7 @@
static int
pcie_mdioread(pcicore_info_t *pi, uint physmedia, uint regaddr, uint *regval)
{
- return pcie_mdioop(pi, physmedia, regaddr, FALSE, regval);
+ return pcie_mdioop(pi, physmedia, regaddr, false, regval);
}
/* use the mdio interface to write to mdio slaves */
@@ -704,7 +704,7 @@
OSL_PCI_WRITE_CONFIG(pi->osh, pi->pciecap_lcreg_offset, sizeof(u32),
w);
- pi->pcie_pr42767 = FALSE;
+ pi->pcie_pr42767 = false;
}
void pcicore_down(void *pch, int state)
@@ -717,7 +717,7 @@
pcie_clkreq_upd(pi, state);
/* Reduce L1 timer for better power savings */
- pcie_extendL1timer(pi, FALSE);
+ pcie_extendL1timer(pi, false);
}
/* ***** Wake-on-wireless-LAN (WOWL) support functions ***** */
@@ -732,7 +732,7 @@
NULL);
if (!cap_ptr)
- return FALSE;
+ return false;
pmecap = OSL_PCI_READ_CONFIG(osh, cap_ptr, sizeof(u32));
@@ -753,7 +753,7 @@
PCI_CAP_POWERMGMTCAP_ID, NULL,
NULL);
if (!cap_ptr)
- return FALSE;
+ return false;
pi->pmecap_offset = cap_ptr;
@@ -794,7 +794,7 @@
u32 w;
if (!pcicore_pmecap(pi))
- return FALSE;
+ return false;
w = OSL_PCI_READ_CONFIG(pi->osh, pi->pmecap_offset + PME_CSR_OFFSET,
sizeof(u32));
diff --git a/drivers/staging/brcm80211/util/sbutils.c b/drivers/staging/brcm80211/util/sbutils.c
index 06a1437..6551938 100644
--- a/drivers/staging/brcm80211/util/sbutils.c
+++ b/drivers/staging/brcm80211/util/sbutils.c
@@ -145,7 +145,7 @@
u32 *r = NULL;
uint w;
uint intr_val = 0;
- bool fast = FALSE;
+ bool fast = false;
si_info_t *sii;
sii = SI_INFO(sih);
@@ -402,7 +402,7 @@
sbconfig_t *sb;
uint origidx;
uint intr_val = 0;
- bool rc = FALSE;
+ bool rc = false;
u32 inband = 0, serror = 0, timeout = 0;
void *corereg = NULL;
volatile u32 imstate, tmstate;
diff --git a/drivers/staging/brcm80211/util/siutils.c b/drivers/staging/brcm80211/util/siutils.c
index 5b945f2..ddbbb60 100644
--- a/drivers/staging/brcm80211/util/siutils.c
+++ b/drivers/staging/brcm80211/util/siutils.c
@@ -144,7 +144,7 @@
PMU_MAX_TRANSITION_DLY);
if (!SBSDIO_ALPAV(clkval)) {
SI_ERROR(("timeout on ALPAV wait, clkval 0x%02x\n", clkval));
- return FALSE;
+ return false;
}
clkset =
SBSDIO_FORCE_HW_CLKREQ_OFF |
@@ -207,7 +207,7 @@
sii->pub.buscorerev = NOREV;
sii->pub.buscoreidx = BADIDX;
- pci = pcie = FALSE;
+ pci = pcie = false;
pcirev = pcierev = NOREV;
pciidx = pcieidx = BADIDX;
@@ -265,9 +265,9 @@
#else
if (pci && pcie) {
if (si_ispcie(sii))
- pci = FALSE;
+ pci = false;
else
- pcie = FALSE;
+ pcie = false;
}
if (pci) {
sii->pub.buscoretype = PCI_CORE_ID;
@@ -290,12 +290,12 @@
&sii->pub, sii->osh,
(void *)PCIEREGS(sii));
if (sii->pch == NULL)
- return FALSE;
+ return false;
}
}
if (si_pci_fixcfg(&sii->pub)) {
SI_ERROR(("si_doattach: sb_pci_fixcfg failed\n"));
- return FALSE;
+ return false;
}
}
#endif
@@ -490,7 +490,7 @@
#ifdef BCMDBG
/* clear any previous epidiag-induced target abort */
- sb_taclear(sih, FALSE);
+ sb_taclear(sih, false);
#endif /* BCMDBG */
#endif
@@ -947,7 +947,7 @@
return sb_iscoreup(sih);
#else
ASSERT(0);
- return FALSE;
+ return false;
#endif
}
}
@@ -1164,7 +1164,7 @@
/* Starting with 4318 it is ILP that is used for the delays */
slowmaxfreq =
- si_slowclk_freq(sii, (sii->pub.ccrev >= 10) ? FALSE : true, cc);
+ si_slowclk_freq(sii, (sii->pub.ccrev >= 10) ? false : true, cc);
pll_on_delay = ((slowmaxfreq * pll_delay) + 999999) / 1000000;
fref_sel_delay = ((slowmaxfreq * FREF_DELAY) + 999999) / 1000000;
@@ -1246,7 +1246,7 @@
}
ASSERT(cc != NULL);
- slowminfreq = si_slowclk_freq(sii, FALSE, cc);
+ slowminfreq = si_slowclk_freq(sii, false, cc);
fpdelay = (((R_REG(sii->osh, &cc->pll_on_delay) + 2) * 1000000) +
(slowminfreq - 1)) / slowminfreq;
@@ -1352,7 +1352,7 @@
/* chipcommon cores prior to rev6 don't support dynamic clock control */
if (sih->ccrev < 6)
- return FALSE;
+ return false;
if (PCI_FORCEHT(sii))
return mode == CLK_FAST;
@@ -1371,7 +1371,7 @@
/* chipcommon cores prior to rev6 don't support dynamic clock control */
if (sii->pub.ccrev < 6)
- return FALSE;
+ return false;
/* Chips with ccrev 10 are EOL and they don't have SYCC_HR which we use below */
ASSERT(sii->pub.ccrev != 10);
@@ -1553,13 +1553,13 @@
u8 cap_ptr;
if (BUSTYPE(sii->pub.bustype) != PCI_BUS)
- return FALSE;
+ return false;
cap_ptr =
pcicore_find_pci_capability(sii->osh, PCI_CAP_PCIECAP_ID, NULL,
NULL);
if (!cap_ptr)
- return FALSE;
+ return false;
return true;
}
@@ -1940,7 +1940,7 @@
return true;
break;
}
- return FALSE;
+ return false;
}
bool si_is_sprom_available(si_t *sih)
@@ -1952,7 +1952,7 @@
u32 sromctrl;
if ((sih->cccaps & CC_CAP_SROM) == 0)
- return FALSE;
+ return false;
sii = SI_INFO(sih);
origidx = sii->curidx;
@@ -2004,7 +2004,7 @@
case BCM43238_CHIP_ID:
case BCM4331_CHIP_ID:
default:
- return FALSE;
+ return false;
}
}