Commit 0965ae88 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0f0881b0

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ bool bcmsdh_intr_query(void *sdh) 
	ASSERT(bcmsdh);

	status = sdioh_interrupt_query(bcmsdh->sdioh, &on);

	if (SDIOH_API_SUCCESS(status))

		return FALSE;

		return false;

	else

		return on;

}
@@ -139,7 +139,7 @@ int bcmsdh_intr_disable(void *sdh) 
	SDIOH_API_RC status;

	ASSERT(bcmsdh);



	status = sdioh_interrupt_set(bcmsdh->sdioh, FALSE);

	status = sdioh_interrupt_set(bcmsdh->sdioh, false);

	return SDIOH_API_SUCCESS(status) ? 0 : BCME_ERROR;

}

drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c

+6 −6
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ bool bcmsdh_chipmatch(u16 vendor, u16 device) 
	}

#endif				/* BCMSDIOH_SPI */



	return FALSE;

	return false;

}



#if defined(BCMPLATFORM_BUS)
@@ -190,7 +190,7 @@ int bcmsdh_probe(struct device *dev) 
	}

#endif				/* defined(OOB_INTR_ONLY) */

	/* allocate SDIO Host Controller state info */

	osh = osl_attach(dev, PCI_BUS, FALSE);

	osh = osl_attach(dev, PCI_BUS, false);

	if (!osh) {

		SDLX_MSG(("%s: osl_attach failed\n", __func__));

		goto err;
@@ -222,7 +222,7 @@ int bcmsdh_probe(struct device *dev) 
	sdhc->sdh = sdh;

	sdhc->oob_irq = irq;

	sdhc->oob_flags = irq_flags;

	sdhc->oob_irq_registered = FALSE;	/* to make sure.. */

	sdhc->oob_irq_registered = false;	/* to make sure.. */

#if defined(OOB_INTR_ONLY)

	spin_lock_init(&sdhc->irq_lock);

#endif
@@ -388,7 +388,7 @@ bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


		SDLX_MSG(("%s: Disabling TI FlashMedia Controller.\n",

			  __func__));

		osh = osl_attach(pdev, PCI_BUS, FALSE);

		osh = osl_attach(pdev, PCI_BUS, false);

		if (!osh) {

			SDLX_MSG(("%s: osl_attach failed\n", __func__));

			goto err;
@@ -423,7 +423,7 @@ bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 */



	/* allocate SDIO Host Controller state info */

	osh = osl_attach(pdev, PCI_BUS, FALSE);

	osh = osl_attach(pdev, PCI_BUS, false);

	if (!osh) {

		SDLX_MSG(("%s: osl_attach failed\n", __func__));

		goto err;
@@ -634,7 +634,7 @@ void bcmsdh_unregister_oob_intr(void) 
	set_irq_wake(sdhcinfo->oob_irq, 0);

	disable_irq(sdhcinfo->oob_irq);	/* just in case.. */

	free_irq(sdhcinfo->oob_irq, NULL);

	sdhcinfo->oob_irq_registered = FALSE;

	sdhcinfo->oob_irq_registered = false;

}

#endif				/* defined(OOB_INTR_ONLY) */

/* Module parameters specific to each host-controller driver */

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+13 −13
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ uint sd_divisor = 2; /* Default 48MHz/2 = 24MHz */ 


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_hiok = false;		/* Don't use hi-speed mode by default */

uint sd_msglevel = 0x01;

uint sd_use_dma = true;

DHD_PM_RESUME_WAIT_INIT(sdioh_request_byte_wait);
@@ -105,7 +105,7 @@ static int sdioh_sdmmc_card_enablefuncs(sdioh_info_t *sd) 
			err_ret));

	}



	return FALSE;

	return false;

}



/*
@@ -321,7 +321,7 @@ extern SDIOH_API_RC sdioh_interrupt_deregister(sdioh_info_t *sd) 
		sdio_release_host(gInstance->func[2]);

	}



	sd->intr_handler_valid = FALSE;

	sd->intr_handler_valid = false;

	sd->intr_handler = NULL;

	sd->intr_handler_arg = NULL;

#elif defined(HW_OOB)
@@ -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) {
@@ -514,7 +514,7 @@ sdioh_iovar_op(sdioh_info_t *si, const char *name, 
		}



	case IOV_GVAL(IOV_RXCHAIN):

		int_val = FALSE;

		int_val = false;

		bcopy(&int_val, arg, val_size);

		break;
@@ -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. */

drivers/staging/brcm80211/brcmfmac/dhd.h

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ typedef struct dhd_pub { 
#define _DHD_PM_RESUME_WAIT(a, b) do {\

			int retry = 0; \

			while (dhd_mmc_suspend && retry++ != b) { \

				wait_event_timeout(a, FALSE, HZ/100); \

				wait_event_timeout(a, false, HZ/100); \

			} \

		}	while (0)

#define DHD_PM_RESUME_WAIT(a)	_DHD_PM_RESUME_WAIT(a, 30)
@@ -171,7 +171,7 @@ typedef struct dhd_pub { 
#define SPINWAIT_SLEEP(a, exp, us) do { \

		uint countdown = (us) + 9999; \

		while ((exp) && (countdown >= 10000)) { \

			wait_event_timeout(a, FALSE, HZ/100); \

			wait_event_timeout(a, false, HZ/100); \

			countdown -= 10000; \

		} \

	} while (0)

drivers/staging/brcm80211/brcmfmac/dhd_cdc.c

+2 −2
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ dhd_prot_ioctl(dhd_pub_t *dhd, int ifidx, wl_ioctl_t *ioc, void *buf, int len) 
		dhd->wme_dp = (u8) ltoh32(val);

	}



	prot->pending = FALSE;

	prot->pending = false;



done:

	dhd_os_proto_unblock(dhd);
@@ -351,7 +351,7 @@ bool dhd_proto_fcinfo(dhd_pub_t *dhd, void *pktbuf, u8 * fcbits) 
	if ((h->flags2 & BDC_FLAG2_FC_FLAG) == BDC_FLAG2_FC_FLAG)

		return true;

#endif

	return FALSE;

	return false;

}



int dhd_prot_hdrpull(dhd_pub_t *dhd, int *ifidx, void *pktbuf)