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

Staging: brcm80211: remove uintptr typedef usage 



Use a unsigned long, that is the proper type for this type of thing on
Linux.

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 8ee48db6

drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		SDLX_MSG(("%s: Cannot enable PCI device\n", __func__));

		goto err;

	}

	sdh = bcmsdh_attach(osh, (void *)(uintptr) pci_resource_start(pdev, 0),

	sdh = bcmsdh_attach(osh, (void *)(unsigned long)pci_resource_start(pdev, 0),

			(void **)&regs, pdev->irq);

	if (!sdh) {

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

drivers/staging/brcm80211/brcmfmac/dhd_cdc.c

+1 −1
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ int dhd_prot_attach(dhd_pub_t *dhd) 
	}



	/* ensure that the msg buf directly follows the cdc msg struct */

	if ((uintptr) (&cdc->msg + 1) != (uintptr) cdc->buf) {

	if ((unsigned long)(&cdc->msg + 1) != (unsigned long)cdc->buf) {

		DHD_ERROR(("dhd_prot_t is not correctly defined\n"));

		goto fail;

	}

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+6 −9
Original line number Diff line number Diff line
@@ -1476,7 +1476,7 @@ int dhd_iscan_print_cache(iscan_buf_t *iscan_skip) 
				   bi->BSSID.octet[2], bi->BSSID.octet[3],

				   bi->BSSID.octet[4], bi->BSSID.octet[5]));



			bi = (wl_bss_info_t *) ((uintptr) bi +

			bi = (wl_bss_info_t *)((unsigned long)bi +

						dtoh32(bi->length));

		}

		iscan_cur = iscan_cur->next;
@@ -1541,7 +1541,7 @@ int dhd_iscan_delete_bss(void *dhdp, void *addr, iscan_buf_t *iscan_skip) 
					bi->BSSID.octet[5]));



					bi_new = bi;

					bi = (wl_bss_info_t *) ((uintptr) bi +

					bi = (wl_bss_info_t *)((unsigned long)bi +

								dtoh32

								(bi->length));

/*
@@ -1567,17 +1567,14 @@ int dhd_iscan_delete_bss(void *dhdp, void *addr, iscan_buf_t *iscan_skip) 
							bi->BSSID.octet[5]));



							bi_next =

							    (wl_bss_info_t

							     *) ((uintptr) bi +

							    (wl_bss_info_t *)((unsigned long)bi +

								 dtoh32

								 (bi->length));

							bcopy(bi, bi_new,

							      dtoh32

							      (bi->length));

							bi_new =

							    (wl_bss_info_t

							     *) ((uintptr)

								 bi_new +

							    (wl_bss_info_t *)((unsigned long)bi_new +

								 dtoh32

								 (bi_new->

								  length));
@@ -1594,7 +1591,7 @@ int dhd_iscan_delete_bss(void *dhdp, void *addr, iscan_buf_t *iscan_skip) 
					}

					break;

				}

				bi = (wl_bss_info_t *) ((uintptr) bi +

				bi = (wl_bss_info_t *)((unsigned long)bi +

							dtoh32(bi->length));

			}

		}
@@ -1649,7 +1646,7 @@ int dhd_iscan_remove_duplicates(void *dhdp, iscan_buf_t *iscan_cur) 


		dhd_iscan_delete_bss(dhdp, bi->BSSID.octet, iscan_cur);



		bi = (wl_bss_info_t *) ((uintptr) bi + dtoh32(bi->length));

		bi = (wl_bss_info_t *)((unsigned long)bi + dtoh32(bi->length));

	}



done:

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+16 −16
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ extern void bcmsdh_enable_hw_oob_intr(void *sdh, bool enable); 
#define PKTALIGN(osh, p, len, align)					\

	do {								\

		uint datalign;						\

		datalign = (uintptr)PKTDATA((p));		\

		datalign = (unsigned long)PKTDATA((p));			\

		datalign = roundup(datalign, (align)) - datalign;	\

		ASSERT(datalign < (align));				\

		ASSERT(PKTLEN((p)) >= ((len) + datalign));	\
@@ -924,7 +924,7 @@ static int dhdsdio_txpkt(dhd_bus_t *bus, void *pkt, uint chan, bool free_pkt) 
	frame = (u8 *) PKTDATA(pkt);



	/* Add alignment padding, allocate new packet if needed */

	pad = ((uintptr) frame % DHD_SDALIGN);

	pad = ((unsigned long)frame % DHD_SDALIGN);

	if (pad) {

		if (PKTHEADROOM(pkt) < pad) {

			DHD_INFO(("%s: insufficient headroom %d for %d pad\n",
@@ -947,7 +947,7 @@ static int dhdsdio_txpkt(dhd_bus_t *bus, void *pkt, uint chan, bool free_pkt) 
			free_pkt = true;

			pkt = new;

			frame = (u8 *) PKTDATA(pkt);

			ASSERT(((uintptr) frame % DHD_SDALIGN) == 0);

			ASSERT(((unsigned long)frame % DHD_SDALIGN) == 0);

			pad = 0;

		} else {

			PKTPUSH(pkt, pad);
@@ -1087,7 +1087,7 @@ int dhd_bus_txdata(struct dhd_bus *bus, void *pkt) 


	/* Add space for the header */

	PKTPUSH(pkt, SDPCM_HDRLEN);

	ASSERT(IS_ALIGNED((uintptr) PKTDATA(pkt), 2));

	ASSERT(IS_ALIGNED((unsigned long)PKTDATA(pkt), 2));



	prec = PRIO2PREC((PKTPRIO(pkt) & PRIOMASK));
@@ -1241,7 +1241,7 @@ int dhd_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen) 


	/* Add alignment padding (optional for ctl frames) */

	if (dhd_alignctl) {

		doff = ((uintptr) frame % DHD_SDALIGN);

		doff = ((unsigned long)frame % DHD_SDALIGN);

		if (doff) {

			frame -= doff;

			len += doff;
@@ -1265,7 +1265,7 @@ int dhd_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen) 
	if (forcealign && (len & (ALIGNMENT - 1)))

		len = roundup(len, ALIGNMENT);



	ASSERT(IS_ALIGNED((uintptr) frame, 2));

	ASSERT(IS_ALIGNED((unsigned long)frame, 2));



	/* Need to lock here to protect txseq and SDIO tx calls */

	dhd_os_sdlock(bus->dhd);
@@ -2336,7 +2336,7 @@ dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, u32 actionid, 


			sd_ptr = (sdreg_t *) params;



			addr = (uintptr) bus->regs + sd_ptr->offset;

			addr = (unsigned long)bus->regs + sd_ptr->offset;

			size = sd_ptr->func;

			int_val = (s32) bcmsdh_reg_read(bus->sdh, addr, size);

			if (bcmsdh_regfail(bus->sdh))
@@ -2352,7 +2352,7 @@ dhdsdio_doiovar(dhd_bus_t *bus, const bcm_iovar_t *vi, u32 actionid, 


			sd_ptr = (sdreg_t *) params;



			addr = (uintptr) bus->regs + sd_ptr->offset;

			addr = (unsigned long)bus->regs + sd_ptr->offset;

			size = sd_ptr->func;

			bcmsdh_reg_write(bus->sdh, addr, size, sd_ptr->value);

			if (bcmsdh_regfail(bus->sdh))
@@ -3086,7 +3086,7 @@ dhdsdio_read_control(dhd_bus_t *bus, u8 *hdr, uint len, uint doff) 
	bus->rxctl = bus->rxbuf;

	if (dhd_alignctl) {

		bus->rxctl += firstread;

		pad = ((uintptr) bus->rxctl % DHD_SDALIGN);

		pad = ((unsigned long)bus->rxctl % DHD_SDALIGN);

		if (pad)

			bus->rxctl += (DHD_SDALIGN - pad);

		bus->rxctl -= firstread;
@@ -3681,7 +3681,7 @@ static uint dhdsdio_readframes(dhd_bus_t *bus, uint maxframes, bool *finished) 
					bus->rxctl = bus->rxbuf;

					if (dhd_alignctl) {

						bus->rxctl += firstread;

						pad = ((uintptr) bus->rxctl %

						pad = ((unsigned long)bus->rxctl %

						      DHD_SDALIGN);

						if (pad)

							bus->rxctl +=
@@ -5091,7 +5091,7 @@ static void *dhdsdio_probe(u16 venid, u16 devid, u16 bus_no, 
	DHD_INFO(("%s: venid 0x%04x devid 0x%04x\n", __func__, venid, devid));



	/* We make assumptions about address window mappings */

	ASSERT((uintptr) regsva == SI_ENUM_BASE);

	ASSERT((unsigned long)regsva == SI_ENUM_BASE);



	/* BCMSDH passes venid and devid based on CIS parsing -- but

	 * low-power start
@@ -5363,7 +5363,7 @@ dhdsdio_probe_attach(struct dhd_bus *bus, osl_t *osh, void *sdh, void *regsva, 
	pktq_init(&bus->txq, (PRIOMASK + 1), QLEN);



	/* Locate an appropriately-aligned portion of hdrbuf */

	bus->rxhdr = (u8 *) roundup((uintptr)&bus->hdrbuf[0], DHD_SDALIGN);

	bus->rxhdr = (u8 *) roundup((unsigned long)&bus->hdrbuf[0], DHD_SDALIGN);



	/* Set the poll and/or interrupt flags */

	bus->intr = (bool) dhd_intr;
@@ -5405,10 +5405,10 @@ static bool dhdsdio_probe_malloc(dhd_bus_t *bus, osl_t *osh, void *sdh) 
	}



	/* Align the buffer */

	if ((uintptr) bus->databuf % DHD_SDALIGN)

	if ((unsigned long)bus->databuf % DHD_SDALIGN)

		bus->dataptr =

		    bus->databuf + (DHD_SDALIGN -

				    ((uintptr) bus->databuf % DHD_SDALIGN));

				    ((unsigned long)bus->databuf % DHD_SDALIGN));

	else

		bus->dataptr = bus->databuf;
@@ -5739,9 +5739,9 @@ static int dhdsdio_download_code_file(struct dhd_bus *bus, char *fw_path) 
			   __func__, MEMBLOCK));

		goto err;

	}

	if ((u32) (uintptr) memblock % DHD_SDALIGN)

	if ((u32)(unsigned long)memblock % DHD_SDALIGN)

		memptr +=

		    (DHD_SDALIGN - ((u32) (uintptr) memblock % DHD_SDALIGN));

		    (DHD_SDALIGN - ((u32)(unsigned long)memblock % DHD_SDALIGN));



	/* Download image */

	while ((len =

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ static inline struct wl_bss_info *next_bss(struct wl_scan_results *list, 
					   struct wl_bss_info *bss)

{

	return bss = bss ?

		(struct wl_bss_info *)((uintptr) bss +

		(struct wl_bss_info *)((unsigned long)bss +

				       dtoh32(bss->length)) : list->bss_info;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE