Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Staging: brcm80211: s/ulong/unsigned long/ 



This changes the usage everywhere in the driver, and removes
the definition as it should no longer be used anywhere.

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 d7e50888

drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ int bcmsdh_probe(struct device *dev) 
{

	osl_t *osh = NULL;

	bcmsdh_hc_t *sdhc = NULL;

	ulong regs = 0;

	unsigned long regs = 0;

	bcmsdh_info_t *sdh = NULL;

#if !defined(BCMLXSDMMC) && defined(BCMPLATFORM_BUS)

	struct platform_device *pdev;
@@ -354,7 +354,7 @@ bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
{

	osl_t *osh = NULL;

	bcmsdh_hc_t *sdhc = NULL;

	ulong regs;

	unsigned long regs;

	bcmsdh_info_t *sdh = NULL;

	int rc;

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ void sdioh_sdmmc_osfree(sdioh_info_t *sd) 
/* Interrupt enable/disable */

SDIOH_API_RC sdioh_interrupt_set(sdioh_info_t *sd, bool enable)

{

	ulong flags;

	unsigned long flags;

	struct sdos_info *sdos;



	sd_trace(("%s: %s\n", __func__, enable ? "Enabling" : "Disabling"));

drivers/staging/brcm80211/brcmfmac/bcmutils.c

+9 −9
Original line number Diff line number Diff line
@@ -530,9 +530,9 @@ const unsigned char bcm_ctype[] = { 
	_BCM_L, _BCM_L, _BCM_L, _BCM_L, _BCM_L	/* 240-255 */

};



ulong bcm_strtoul(char *cp, char **endp, uint base)

unsigned long bcm_strtoul(char *cp, char **endp, uint base)

{

	ulong result, last_result = 0, value;

	unsigned long result, last_result = 0, value;

	bool minus;



	minus = FALSE;
@@ -572,13 +572,13 @@ ulong bcm_strtoul(char *cp, char **endp, uint base) 
		result = result * base + value;

		/* Detected overflow */

		if (result < last_result && !minus)

			return (ulong)-1;

			return (unsigned long)-1;

		last_result = result;

		cp++;

	}



	if (minus)

		result = (ulong) (-(long)result);

		result = (unsigned long) (-(long)result);



	if (endp)

		*endp = (char *)cp;
@@ -807,9 +807,9 @@ int bcm_ether_atoe(char *p, struct ether_addr *ea) 
 * parameter order is like strncpy, but returns count

 * of bytes copied. Minimum bytes copied is null char(1)/wchar(2)

 */

ulong wchar2ascii(char *abuf, unsigned short * wbuf, unsigned short wbuflen, ulong abuflen)

unsigned long wchar2ascii(char *abuf, unsigned short * wbuf, unsigned short wbuflen, unsigned long abuflen)

{

	ulong copyct = 1;

	unsigned long copyct = 1;

	unsigned short i;



	if (abuflen == 0)
@@ -1246,7 +1246,7 @@ uint32 hndcrc32(u8 *pdata, /* pointer to array of data to process */ 
	u8 *pend;

#ifdef __mips__

	u8 tmp[4];

	ulong *tptr = (ulong *) tmp;

	unsigned long *tptr = (unsigned long *) tmp;



	/* in case the beginning of the buffer isn't aligned */

	pend = (u8 *) ((uint) (pdata + 3) & 0xfffffffc);
@@ -1257,8 +1257,8 @@ uint32 hndcrc32(u8 *pdata, /* pointer to array of data to process */ 
	/* handle bulk of data as 32-bit words */

	pend = pdata + (nbytes & 0xfffffffc);

	while (pdata < pend) {

		*tptr = *(ulong *) pdata;

		pdata += sizeof(ulong *);

		*tptr = *(unsigned long *) pdata;

		pdata += sizeof(unsigned long *);

		CRC_INNER_LOOP(32, crc, tmp[0]);

		CRC_INNER_LOOP(32, crc, tmp[1]);

		CRC_INNER_LOOP(32, crc, tmp[2]);

drivers/staging/brcm80211/brcmfmac/dhd.h

+17 −17
Original line number Diff line number Diff line
@@ -105,33 +105,33 @@ typedef struct dhd_pub { 


	/* Dongle media info */

	bool iswl;		/* Dongle-resident driver is wl */

	ulong drv_version;	/* Version of dongle-resident driver */

	unsigned long drv_version;	/* Version of dongle-resident driver */

	struct ether_addr mac;	/* MAC address obtained from dongle */

	dngl_stats_t dstats;	/* Stats for dongle-based data */



	/* Additional stats for the bus level */

	ulong tx_packets;	/* Data packets sent to dongle */

	ulong tx_multicast;	/* Multicast data packets sent to dongle */

	ulong tx_errors;	/* Errors in sending data to dongle */

	ulong tx_ctlpkts;	/* Control packets sent to dongle */

	ulong tx_ctlerrs;	/* Errors sending control frames to dongle */

	ulong rx_packets;	/* Packets sent up the network interface */

	ulong rx_multicast;	/* Multicast packets sent up the network

	unsigned long tx_packets;	/* Data packets sent to dongle */

	unsigned long tx_multicast;	/* Multicast data packets sent to dongle */

	unsigned long tx_errors;	/* Errors in sending data to dongle */

	unsigned long tx_ctlpkts;	/* Control packets sent to dongle */

	unsigned long tx_ctlerrs;	/* Errors sending control frames to dongle */

	unsigned long rx_packets;	/* Packets sent up the network interface */

	unsigned long rx_multicast;	/* Multicast packets sent up the network

					 interface */

	ulong rx_errors;	/* Errors processing rx data packets */

	ulong rx_ctlpkts;	/* Control frames processed from dongle */

	ulong rx_ctlerrs;	/* Errors in processing rx control frames */

	ulong rx_dropped;	/* Packets dropped locally (no memory) */

	ulong rx_flushed;	/* Packets flushed due to

	unsigned long rx_errors;	/* Errors processing rx data packets */

	unsigned long rx_ctlpkts;	/* Control frames processed from dongle */

	unsigned long rx_ctlerrs;	/* Errors in processing rx control frames */

	unsigned long rx_dropped;	/* Packets dropped locally (no memory) */

	unsigned long rx_flushed;	/* Packets flushed due to

				unscheduled sendup thread */

	ulong wd_dpc_sched;	/* Number of times dhd dpc scheduled by

	unsigned long wd_dpc_sched;	/* Number of times dhd dpc scheduled by

					 watchdog timer */



	ulong rx_readahead_cnt;	/* Number of packets where header read-ahead

	unsigned long rx_readahead_cnt;	/* Number of packets where header read-ahead

					 was used. */

	ulong tx_realloc;	/* Number of tx packets we had to realloc for

	unsigned long tx_realloc;	/* Number of tx packets we had to realloc for

					 headroom */

	ulong fc_packets;	/* Number of flow control pkts recvd */

	unsigned long fc_packets;	/* Number of flow control pkts recvd */



	/* Last error return */

	int bcmerror;

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+5 −5
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ static char dhd_version[] = "Dongle Host Driver, version " EPI_VERSION_STR 
struct iw_statistics *dhd_get_wireless_stats(struct net_device *dev);

#endif				/* defined(CONFIG_WIRELESS_EXT) */



static void dhd_dpc(ulong data);

static void dhd_dpc(unsigned long data);

/* forward decl */

extern int dhd_wait_pend8021x(struct net_device *dev);
@@ -1328,7 +1328,7 @@ static int dhd_watchdog_thread(void *data) 
	complete_and_exit(&dhd->watchdog_exited, 0);

}



static void dhd_watchdog(ulong data)

static void dhd_watchdog(unsigned long data)

{

	dhd_info_t *dhd = (dhd_info_t *) data;
@@ -1399,7 +1399,7 @@ static int dhd_dpc_thread(void *data) 
	complete_and_exit(&dhd->dpc_exited, 0);

}



static void dhd_dpc(ulong data)

static void dhd_dpc(unsigned long data)

{

	dhd_info_t *dhd;
@@ -1999,7 +1999,7 @@ dhd_pub_t *dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen) 


	/* Set up the watchdog timer */

	init_timer(&dhd->timer);

	dhd->timer.data = (ulong) dhd;

	dhd->timer.data = (unsigned long) dhd;

	dhd->timer.function = dhd_watchdog;



	/* Initialize thread based operation and lock */
@@ -2025,7 +2025,7 @@ dhd_pub_t *dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen) 
		init_completion(&dhd->dpc_exited);

		dhd->dpc_pid = kernel_thread(dhd_dpc_thread, dhd, 0);

	} else {

		tasklet_init(&dhd->tasklet, dhd_dpc, (ulong) dhd);

		tasklet_init(&dhd->tasklet, dhd_dpc, (unsigned long) dhd);

		dhd->dpc_pid = -1;

	}