---

yaml
---
r: 220072
b: refs/heads/master
c: 3deea90
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7e508880b8f674aa82d3d5d9b2de27c034329a3
+refs/heads/master: 3deea9049e161965fe3caa2ae1f5f0bc96643465

trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c

@@ -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;
 

trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c

@@ -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"));

trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c

@@ -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]);

trunk/drivers/staging/brcm80211/brcmfmac/dhd.h

@@ -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;

trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c

@@ -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;
 	}
 

trunk/drivers/staging/brcm80211/brcmfmac/linux_osl.c

@@ -482,14 +482,14 @@ uint osl_malloc_failed(osl_t *osh)
 	return osh->failed;
 }
 
-void *osl_dma_alloc_consistent(osl_t *osh, uint size, ulong *pap)
+void *osl_dma_alloc_consistent(osl_t *osh, uint size, unsigned long *pap)
 {
 	ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
 
 	return pci_alloc_consistent(osh->pdev, size, (dma_addr_t *) pap);
 }
 
-void osl_dma_free_consistent(osl_t *osh, void *va, uint size, ulong pa)
+void osl_dma_free_consistent(osl_t *osh, void *va, uint size, unsigned long pa)
 {
 	ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC)));
 

trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

@@ -285,7 +285,7 @@ static int32 wl_config_dongle(struct wl_priv *wl, bool need_lock);
 /*
 ** iscan handler
 */
-static void wl_iscan_timer(ulong data);
+static void wl_iscan_timer(unsigned long data);
 static void wl_term_iscan(struct wl_priv *wl);
 static int32 wl_init_iscan(struct wl_priv *wl);
 static int32 wl_iscan_thread(void *data);
@@ -2939,7 +2939,7 @@ static int32 wl_iscan_thread(void *data)
 	return 0;
 }
 
-static void wl_iscan_timer(ulong data)
+static void wl_iscan_timer(unsigned long data)
 {
 	struct wl_iscan_ctrl *iscan = (struct wl_iscan_ctrl *)data;
 
@@ -2990,7 +2990,7 @@ static int32 wl_init_iscan(struct wl_priv *wl)
 		wl_init_iscan_eloop(&iscan->el);
 		iscan->timer_ms = WL_ISCAN_TIMER_INTERVAL_MS;
 		init_timer(&iscan->timer);
-		iscan->timer.data = (ulong) iscan;
+		iscan->timer.data = (unsigned long) iscan;
 		iscan->timer.function = wl_iscan_timer;
 		sema_init(&iscan->sync, 0);
 		init_completion(&iscan->exited);

trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h

@@ -267,7 +267,7 @@ struct wl_connect_info {
 /* firmware /nvram downloading controller */
 struct wl_fw_ctrl {
 	const struct firmware *fw_entry;
-	ulong status;
+	unsigned long status;
 	uint32 ptr;
 	s8 fw_name[WL_FILE_NAME_MAX];
 	s8 nvram_name[WL_FILE_NAME_MAX];
@@ -316,7 +316,7 @@ struct wl_priv {
 				 downloading */
 	struct wl_pmk_list *pmk_list;	/* wpa2 pmk list */
 	int32 event_pid;	/* pid of main event handler thread */
-	ulong status;		/* current dongle status */
+	unsigned long status;		/* current dongle status */
 	void *pub;
 	uint32 channel;		/* current channel */
 	bool iscan_on;		/* iscan on/off switch */

trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c

@@ -143,7 +143,7 @@ typedef struct iscan_info {
 	int iscan_ex_param_size;
 } iscan_info_t;
 iscan_info_t *g_iscan = NULL;
-static void wl_iw_timerfunc(ulong data);
+static void wl_iw_timerfunc(unsigned long data);
 static void wl_iw_set_event_mask(struct net_device *dev);
 static int wl_iw_iscan(iscan_info_t *iscan, wlc_ssid_t *ssid, uint16 action);
 #endif				/* defined(WL_IW_USE_ISCAN) */
@@ -1070,7 +1070,7 @@ static int wl_iw_iscan(iscan_info_t *iscan, wlc_ssid_t *ssid, uint16 action)
 	return err;
 }
 
-static void wl_iw_timerfunc(ulong data)
+static void wl_iw_timerfunc(unsigned long data)
 {
 	iscan_info_t *iscan = (iscan_info_t *) data;
 	if (iscan) {
@@ -3731,7 +3731,7 @@ int wl_iw_attach(struct net_device *dev, void *dhdp)
 
 	iscan->timer_ms = 3000;
 	init_timer(&iscan->timer);
-	iscan->timer.data = (ulong) iscan;
+	iscan->timer.data = (unsigned long) iscan;
 	iscan->timer.function = wl_iw_timerfunc;
 
 	sema_init(&iscan->sysioc_sem, 0);

trunk/drivers/staging/brcm80211/include/bcmutils.h

@@ -207,13 +207,13 @@ extern "C" {
 #ifdef BRCM_FULLMAC
 /* string */
 	extern int BCMROMFN(bcm_atoi) (char *s);
-	extern ulong BCMROMFN(bcm_strtoul) (char *cp, char **endp, uint base);
+	extern unsigned long BCMROMFN(bcm_strtoul) (char *cp, char **endp, uint base);
 	extern char *BCMROMFN(bcmstrstr) (char *haystack, char *needle);
 	extern char *BCMROMFN(bcmstrcat) (char *dest, const char *src);
 	extern char *BCMROMFN(bcmstrncat) (char *dest, const char *src,
 					   uint size);
-	extern ulong wchar2ascii(char *abuf, unsigned short *wbuf, unsigned short wbuflen,
-				 ulong abuflen);
+	extern unsigned long wchar2ascii(char *abuf, unsigned short *wbuf, unsigned short wbuflen,
+				 unsigned long abuflen);
 	char *bcmstrtok(char **string, const char *delimiters, char *tokdelim);
 	int bcmstricmp(const char *s1, const char *s2);
 	int bcmstrnicmp(const char *s1, const char *s2, int cnt);

trunk/drivers/staging/brcm80211/include/linux_osl.h

@@ -121,19 +121,19 @@ extern uint osl_malloc_failed(osl_t *osh);
 #define	DMA_CONSISTENT_ALIGN	PAGE_SIZE
 #define	DMA_ALLOC_CONSISTENT(osh, size, pap, dmah, alignbits) \
 	osl_dma_alloc_consistent((osh), (size), (pap))
-extern void *osl_dma_alloc_consistent(osl_t *osh, uint size, ulong *pap);
+extern void *osl_dma_alloc_consistent(osl_t *osh, uint size, unsigned long *pap);
 #else
 /* allocate/free shared (dma-able) consistent memory */
 #define	DMA_CONSISTENT_ALIGN	osl_dma_consistent_align()
 #define	DMA_ALLOC_CONSISTENT(osh, size, align, tot, pap, dmah) \
 	osl_dma_alloc_consistent((osh), (size), (align), (tot), (pap))
 extern uint osl_dma_consistent_align(void);
 extern void *osl_dma_alloc_consistent(osl_t *osh, uint size, uint16 align,
-				      uint *tot, ulong *pap);
+				      uint *tot, unsigned long *pap);
 #endif
 #define	DMA_FREE_CONSISTENT(osh, va, size, pa, dmah) \
 	osl_dma_free_consistent((osh), (void *)(va), (size), (pa))
-extern void osl_dma_free_consistent(osl_t *osh, void *va, uint size, ulong pa);
+extern void osl_dma_free_consistent(osl_t *osh, void *va, uint size, unsigned long pa);
 
 /* map/unmap direction */
 #define	DMA_TX	1		/* TX direction for DMA */

trunk/drivers/staging/brcm80211/include/typedefs.h

@@ -31,22 +31,17 @@ typedef unsigned long long int uintptr;
 #endif
 
 #define TYPEDEF_UINT
-#define TYPEDEF_ULONG
 
 /*
  * Default Typedefs
  */
 
-/* define ushort, uint, ulong */
+/* define uint */
 
 #ifndef TYPEDEF_UINT
 typedef unsigned int uint;
 #endif
 
-#ifndef TYPEDEF_ULONG
-typedef unsigned long ulong;
-#endif
-
 /* define [u]int16/32/64, uintptr */
 
 #ifndef TYPEDEF_UINT16
@@ -90,7 +85,6 @@ typedef signed int int32;
 #define	AUTO	(-1)		/* Auto = -1 */
 
 #undef TYPEDEF_UINT
-#undef TYPEDEF_ULONG
 #undef TYPEDEF_UINT16
 #undef TYPEDEF_UINT32
 #undef TYPEDEF_UINTPTR