Commit 0f0881b0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+3 −3
Original line number Diff line number Diff line
@@ -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;



		}

	}

drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c

+9 −9
Original line number Diff line number Diff line
@@ -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;

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+13 −13
Original line number Diff line number Diff line
@@ -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. */

drivers/staging/brcm80211/brcmfmac/dhd.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/staging/brcm80211/brcmfmac/dhd_bus.h

+1 −1
Original line number Diff line number Diff line
@@ -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);