diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-05 14:15:47 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-05 14:15:47 -0400 |
commit | 3deea9049e161965fe3caa2ae1f5f0bc96643465 (patch) | |
tree | 29fd709233886ef1723b25e4cc34b8b367184729 | |
parent | d7e508880b8f674aa82d3d5d9b2de27c034329a3 (diff) |
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: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmutils.c | 18 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd.h | 34 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 10 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/linux_osl.c | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_iw.c | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/include/bcmutils.h | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/include/linux_osl.h | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/include/typedefs.h | 8 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wl_mac80211.c | 26 | ||||
-rw-r--r-- | drivers/staging/brcm80211/sys/wl_mac80211.h | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/linux_osl.c | 4 |
15 files changed, 67 insertions, 73 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c index ac804e93c83..453841fe72e 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | |||
@@ -157,7 +157,7 @@ int bcmsdh_probe(struct device *dev) | |||
157 | { | 157 | { |
158 | osl_t *osh = NULL; | 158 | osl_t *osh = NULL; |
159 | bcmsdh_hc_t *sdhc = NULL; | 159 | bcmsdh_hc_t *sdhc = NULL; |
160 | ulong regs = 0; | 160 | unsigned long regs = 0; |
161 | bcmsdh_info_t *sdh = NULL; | 161 | bcmsdh_info_t *sdh = NULL; |
162 | #if !defined(BCMLXSDMMC) && defined(BCMPLATFORM_BUS) | 162 | #if !defined(BCMLXSDMMC) && defined(BCMPLATFORM_BUS) |
163 | struct platform_device *pdev; | 163 | struct platform_device *pdev; |
@@ -354,7 +354,7 @@ bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
354 | { | 354 | { |
355 | osl_t *osh = NULL; | 355 | osl_t *osh = NULL; |
356 | bcmsdh_hc_t *sdhc = NULL; | 356 | bcmsdh_hc_t *sdhc = NULL; |
357 | ulong regs; | 357 | unsigned long regs; |
358 | bcmsdh_info_t *sdh = NULL; | 358 | bcmsdh_info_t *sdh = NULL; |
359 | int rc; | 359 | int rc; |
360 | 360 | ||
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c index 7d95c3a58fe..2b71e206760 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | |||
@@ -174,7 +174,7 @@ void sdioh_sdmmc_osfree(sdioh_info_t *sd) | |||
174 | /* Interrupt enable/disable */ | 174 | /* Interrupt enable/disable */ |
175 | SDIOH_API_RC sdioh_interrupt_set(sdioh_info_t *sd, bool enable) | 175 | SDIOH_API_RC sdioh_interrupt_set(sdioh_info_t *sd, bool enable) |
176 | { | 176 | { |
177 | ulong flags; | 177 | unsigned long flags; |
178 | struct sdos_info *sdos; | 178 | struct sdos_info *sdos; |
179 | 179 | ||
180 | sd_trace(("%s: %s\n", __func__, enable ? "Enabling" : "Disabling")); | 180 | sd_trace(("%s: %s\n", __func__, enable ? "Enabling" : "Disabling")); |
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmutils.c b/drivers/staging/brcm80211/brcmfmac/bcmutils.c index a95d12298d9..73eb0868622 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmutils.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmutils.c | |||
@@ -530,9 +530,9 @@ const unsigned char bcm_ctype[] = { | |||
530 | _BCM_L, _BCM_L, _BCM_L, _BCM_L, _BCM_L /* 240-255 */ | 530 | _BCM_L, _BCM_L, _BCM_L, _BCM_L, _BCM_L /* 240-255 */ |
531 | }; | 531 | }; |
532 | 532 | ||
533 | ulong bcm_strtoul(char *cp, char **endp, uint base) | 533 | unsigned long bcm_strtoul(char *cp, char **endp, uint base) |
534 | { | 534 | { |
535 | ulong result, last_result = 0, value; | 535 | unsigned long result, last_result = 0, value; |
536 | bool minus; | 536 | bool minus; |
537 | 537 | ||
538 | minus = FALSE; | 538 | minus = FALSE; |
@@ -572,13 +572,13 @@ ulong bcm_strtoul(char *cp, char **endp, uint base) | |||
572 | result = result * base + value; | 572 | result = result * base + value; |
573 | /* Detected overflow */ | 573 | /* Detected overflow */ |
574 | if (result < last_result && !minus) | 574 | if (result < last_result && !minus) |
575 | return (ulong)-1; | 575 | return (unsigned long)-1; |
576 | last_result = result; | 576 | last_result = result; |
577 | cp++; | 577 | cp++; |
578 | } | 578 | } |
579 | 579 | ||
580 | if (minus) | 580 | if (minus) |
581 | result = (ulong) (-(long)result); | 581 | result = (unsigned long) (-(long)result); |
582 | 582 | ||
583 | if (endp) | 583 | if (endp) |
584 | *endp = (char *)cp; | 584 | *endp = (char *)cp; |
@@ -807,9 +807,9 @@ int bcm_ether_atoe(char *p, struct ether_addr *ea) | |||
807 | * parameter order is like strncpy, but returns count | 807 | * parameter order is like strncpy, but returns count |
808 | * of bytes copied. Minimum bytes copied is null char(1)/wchar(2) | 808 | * of bytes copied. Minimum bytes copied is null char(1)/wchar(2) |
809 | */ | 809 | */ |
810 | ulong wchar2ascii(char *abuf, unsigned short * wbuf, unsigned short wbuflen, ulong abuflen) | 810 | unsigned long wchar2ascii(char *abuf, unsigned short * wbuf, unsigned short wbuflen, unsigned long abuflen) |
811 | { | 811 | { |
812 | ulong copyct = 1; | 812 | unsigned long copyct = 1; |
813 | unsigned short i; | 813 | unsigned short i; |
814 | 814 | ||
815 | if (abuflen == 0) | 815 | if (abuflen == 0) |
@@ -1246,7 +1246,7 @@ uint32 hndcrc32(u8 *pdata, /* pointer to array of data to process */ | |||
1246 | u8 *pend; | 1246 | u8 *pend; |
1247 | #ifdef __mips__ | 1247 | #ifdef __mips__ |
1248 | u8 tmp[4]; | 1248 | u8 tmp[4]; |
1249 | ulong *tptr = (ulong *) tmp; | 1249 | unsigned long *tptr = (unsigned long *) tmp; |
1250 | 1250 | ||
1251 | /* in case the beginning of the buffer isn't aligned */ | 1251 | /* in case the beginning of the buffer isn't aligned */ |
1252 | pend = (u8 *) ((uint) (pdata + 3) & 0xfffffffc); | 1252 | pend = (u8 *) ((uint) (pdata + 3) & 0xfffffffc); |
@@ -1257,8 +1257,8 @@ uint32 hndcrc32(u8 *pdata, /* pointer to array of data to process */ | |||
1257 | /* handle bulk of data as 32-bit words */ | 1257 | /* handle bulk of data as 32-bit words */ |
1258 | pend = pdata + (nbytes & 0xfffffffc); | 1258 | pend = pdata + (nbytes & 0xfffffffc); |
1259 | while (pdata < pend) { | 1259 | while (pdata < pend) { |
1260 | *tptr = *(ulong *) pdata; | 1260 | *tptr = *(unsigned long *) pdata; |
1261 | pdata += sizeof(ulong *); | 1261 | pdata += sizeof(unsigned long *); |
1262 | CRC_INNER_LOOP(32, crc, tmp[0]); | 1262 | CRC_INNER_LOOP(32, crc, tmp[0]); |
1263 | CRC_INNER_LOOP(32, crc, tmp[1]); | 1263 | CRC_INNER_LOOP(32, crc, tmp[1]); |
1264 | CRC_INNER_LOOP(32, crc, tmp[2]); | 1264 | CRC_INNER_LOOP(32, crc, tmp[2]); |
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd.h b/drivers/staging/brcm80211/brcmfmac/dhd.h index 353c6522f3d..bcbb2f12b33 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd.h +++ b/drivers/staging/brcm80211/brcmfmac/dhd.h | |||
@@ -105,33 +105,33 @@ typedef struct dhd_pub { | |||
105 | 105 | ||
106 | /* Dongle media info */ | 106 | /* Dongle media info */ |
107 | bool iswl; /* Dongle-resident driver is wl */ | 107 | bool iswl; /* Dongle-resident driver is wl */ |
108 | ulong drv_version; /* Version of dongle-resident driver */ | 108 | unsigned long drv_version; /* Version of dongle-resident driver */ |
109 | struct ether_addr mac; /* MAC address obtained from dongle */ | 109 | struct ether_addr mac; /* MAC address obtained from dongle */ |
110 | dngl_stats_t dstats; /* Stats for dongle-based data */ | 110 | dngl_stats_t dstats; /* Stats for dongle-based data */ |
111 | 111 | ||
112 | /* Additional stats for the bus level */ | 112 | /* Additional stats for the bus level */ |
113 | ulong tx_packets; /* Data packets sent to dongle */ | 113 | unsigned long tx_packets; /* Data packets sent to dongle */ |
114 | ulong tx_multicast; /* Multicast data packets sent to dongle */ | 114 | unsigned long tx_multicast; /* Multicast data packets sent to dongle */ |
115 | ulong tx_errors; /* Errors in sending data to dongle */ | 115 | unsigned long tx_errors; /* Errors in sending data to dongle */ |
116 | ulong tx_ctlpkts; /* Control packets sent to dongle */ | 116 | unsigned long tx_ctlpkts; /* Control packets sent to dongle */ |
117 | ulong tx_ctlerrs; /* Errors sending control frames to dongle */ | 117 | unsigned long tx_ctlerrs; /* Errors sending control frames to dongle */ |
118 | ulong rx_packets; /* Packets sent up the network interface */ | 118 | unsigned long rx_packets; /* Packets sent up the network interface */ |
119 | ulong rx_multicast; /* Multicast packets sent up the network | 119 | unsigned long rx_multicast; /* Multicast packets sent up the network |
120 | interface */ | 120 | interface */ |
121 | ulong rx_errors; /* Errors processing rx data packets */ | 121 | unsigned long rx_errors; /* Errors processing rx data packets */ |
122 | ulong rx_ctlpkts; /* Control frames processed from dongle */ | 122 | unsigned long rx_ctlpkts; /* Control frames processed from dongle */ |
123 | ulong rx_ctlerrs; /* Errors in processing rx control frames */ | 123 | unsigned long rx_ctlerrs; /* Errors in processing rx control frames */ |
124 | ulong rx_dropped; /* Packets dropped locally (no memory) */ | 124 | unsigned long rx_dropped; /* Packets dropped locally (no memory) */ |
125 | ulong rx_flushed; /* Packets flushed due to | 125 | unsigned long rx_flushed; /* Packets flushed due to |
126 | unscheduled sendup thread */ | 126 | unscheduled sendup thread */ |
127 | ulong wd_dpc_sched; /* Number of times dhd dpc scheduled by | 127 | unsigned long wd_dpc_sched; /* Number of times dhd dpc scheduled by |
128 | watchdog timer */ | 128 | watchdog timer */ |
129 | 129 | ||
130 | ulong rx_readahead_cnt; /* Number of packets where header read-ahead | 130 | unsigned long rx_readahead_cnt; /* Number of packets where header read-ahead |
131 | was used. */ | 131 | was used. */ |
132 | ulong tx_realloc; /* Number of tx packets we had to realloc for | 132 | unsigned long tx_realloc; /* Number of tx packets we had to realloc for |
133 | headroom */ | 133 | headroom */ |
134 | ulong fc_packets; /* Number of flow control pkts recvd */ | 134 | unsigned long fc_packets; /* Number of flow control pkts recvd */ |
135 | 135 | ||
136 | /* Last error return */ | 136 | /* Last error return */ |
137 | int bcmerror; | 137 | int bcmerror; |
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 2d8b467d8ed..4306095162a 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c | |||
@@ -412,7 +412,7 @@ static char dhd_version[] = "Dongle Host Driver, version " EPI_VERSION_STR | |||
412 | struct iw_statistics *dhd_get_wireless_stats(struct net_device *dev); | 412 | struct iw_statistics *dhd_get_wireless_stats(struct net_device *dev); |
413 | #endif /* defined(CONFIG_WIRELESS_EXT) */ | 413 | #endif /* defined(CONFIG_WIRELESS_EXT) */ |
414 | 414 | ||
415 | static void dhd_dpc(ulong data); | 415 | static void dhd_dpc(unsigned long data); |
416 | /* forward decl */ | 416 | /* forward decl */ |
417 | extern int dhd_wait_pend8021x(struct net_device *dev); | 417 | extern int dhd_wait_pend8021x(struct net_device *dev); |
418 | 418 | ||
@@ -1328,7 +1328,7 @@ static int dhd_watchdog_thread(void *data) | |||
1328 | complete_and_exit(&dhd->watchdog_exited, 0); | 1328 | complete_and_exit(&dhd->watchdog_exited, 0); |
1329 | } | 1329 | } |
1330 | 1330 | ||
1331 | static void dhd_watchdog(ulong data) | 1331 | static void dhd_watchdog(unsigned long data) |
1332 | { | 1332 | { |
1333 | dhd_info_t *dhd = (dhd_info_t *) data; | 1333 | dhd_info_t *dhd = (dhd_info_t *) data; |
1334 | 1334 | ||
@@ -1399,7 +1399,7 @@ static int dhd_dpc_thread(void *data) | |||
1399 | complete_and_exit(&dhd->dpc_exited, 0); | 1399 | complete_and_exit(&dhd->dpc_exited, 0); |
1400 | } | 1400 | } |
1401 | 1401 | ||
1402 | static void dhd_dpc(ulong data) | 1402 | static void dhd_dpc(unsigned long data) |
1403 | { | 1403 | { |
1404 | dhd_info_t *dhd; | 1404 | dhd_info_t *dhd; |
1405 | 1405 | ||
@@ -1999,7 +1999,7 @@ dhd_pub_t *dhd_attach(osl_t *osh, struct dhd_bus *bus, uint bus_hdrlen) | |||
1999 | 1999 | ||
2000 | /* Set up the watchdog timer */ | 2000 | /* Set up the watchdog timer */ |
2001 | init_timer(&dhd->timer); | 2001 | init_timer(&dhd->timer); |
2002 | dhd->timer.data = (ulong) dhd; | 2002 | dhd->timer.data = (unsigned long) dhd; |
2003 | dhd->timer.function = dhd_watchdog; | 2003 | dhd->timer.function = dhd_watchdog; |
2004 | 2004 | ||
2005 | /* Initialize thread based operation and lock */ | 2005 | /* 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) | |||
2025 | init_completion(&dhd->dpc_exited); | 2025 | init_completion(&dhd->dpc_exited); |
2026 | dhd->dpc_pid = kernel_thread(dhd_dpc_thread, dhd, 0); | 2026 | dhd->dpc_pid = kernel_thread(dhd_dpc_thread, dhd, 0); |
2027 | } else { | 2027 | } else { |
2028 | tasklet_init(&dhd->tasklet, dhd_dpc, (ulong) dhd); | 2028 | tasklet_init(&dhd->tasklet, dhd_dpc, (unsigned long) dhd); |
2029 | dhd->dpc_pid = -1; | 2029 | dhd->dpc_pid = -1; |
2030 | } | 2030 | } |
2031 | 2031 | ||
diff --git a/drivers/staging/brcm80211/brcmfmac/linux_osl.c b/drivers/staging/brcm80211/brcmfmac/linux_osl.c index 770238bdcf9..f98c05af7c7 100644 --- a/drivers/staging/brcm80211/brcmfmac/linux_osl.c +++ b/drivers/staging/brcm80211/brcmfmac/linux_osl.c | |||
@@ -482,14 +482,14 @@ uint osl_malloc_failed(osl_t *osh) | |||
482 | return osh->failed; | 482 | return osh->failed; |
483 | } | 483 | } |
484 | 484 | ||
485 | void *osl_dma_alloc_consistent(osl_t *osh, uint size, ulong *pap) | 485 | void *osl_dma_alloc_consistent(osl_t *osh, uint size, unsigned long *pap) |
486 | { | 486 | { |
487 | ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); | 487 | ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); |
488 | 488 | ||
489 | return pci_alloc_consistent(osh->pdev, size, (dma_addr_t *) pap); | 489 | return pci_alloc_consistent(osh->pdev, size, (dma_addr_t *) pap); |
490 | } | 490 | } |
491 | 491 | ||
492 | void osl_dma_free_consistent(osl_t *osh, void *va, uint size, ulong pa) | 492 | void osl_dma_free_consistent(osl_t *osh, void *va, uint size, unsigned long pa) |
493 | { | 493 | { |
494 | ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); | 494 | ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); |
495 | 495 | ||
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c index 88d2f842370..f8d07a5522b 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | |||
@@ -285,7 +285,7 @@ static int32 wl_config_dongle(struct wl_priv *wl, bool need_lock); | |||
285 | /* | 285 | /* |
286 | ** iscan handler | 286 | ** iscan handler |
287 | */ | 287 | */ |
288 | static void wl_iscan_timer(ulong data); | 288 | static void wl_iscan_timer(unsigned long data); |
289 | static void wl_term_iscan(struct wl_priv *wl); | 289 | static void wl_term_iscan(struct wl_priv *wl); |
290 | static int32 wl_init_iscan(struct wl_priv *wl); | 290 | static int32 wl_init_iscan(struct wl_priv *wl); |
291 | static int32 wl_iscan_thread(void *data); | 291 | static int32 wl_iscan_thread(void *data); |
@@ -2939,7 +2939,7 @@ static int32 wl_iscan_thread(void *data) | |||
2939 | return 0; | 2939 | return 0; |
2940 | } | 2940 | } |
2941 | 2941 | ||
2942 | static void wl_iscan_timer(ulong data) | 2942 | static void wl_iscan_timer(unsigned long data) |
2943 | { | 2943 | { |
2944 | struct wl_iscan_ctrl *iscan = (struct wl_iscan_ctrl *)data; | 2944 | struct wl_iscan_ctrl *iscan = (struct wl_iscan_ctrl *)data; |
2945 | 2945 | ||
@@ -2990,7 +2990,7 @@ static int32 wl_init_iscan(struct wl_priv *wl) | |||
2990 | wl_init_iscan_eloop(&iscan->el); | 2990 | wl_init_iscan_eloop(&iscan->el); |
2991 | iscan->timer_ms = WL_ISCAN_TIMER_INTERVAL_MS; | 2991 | iscan->timer_ms = WL_ISCAN_TIMER_INTERVAL_MS; |
2992 | init_timer(&iscan->timer); | 2992 | init_timer(&iscan->timer); |
2993 | iscan->timer.data = (ulong) iscan; | 2993 | iscan->timer.data = (unsigned long) iscan; |
2994 | iscan->timer.function = wl_iscan_timer; | 2994 | iscan->timer.function = wl_iscan_timer; |
2995 | sema_init(&iscan->sync, 0); | 2995 | sema_init(&iscan->sync, 0); |
2996 | init_completion(&iscan->exited); | 2996 | init_completion(&iscan->exited); |
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h index 0937b6af459..9dce8aa2de2 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | |||
@@ -267,7 +267,7 @@ struct wl_connect_info { | |||
267 | /* firmware /nvram downloading controller */ | 267 | /* firmware /nvram downloading controller */ |
268 | struct wl_fw_ctrl { | 268 | struct wl_fw_ctrl { |
269 | const struct firmware *fw_entry; | 269 | const struct firmware *fw_entry; |
270 | ulong status; | 270 | unsigned long status; |
271 | uint32 ptr; | 271 | uint32 ptr; |
272 | s8 fw_name[WL_FILE_NAME_MAX]; | 272 | s8 fw_name[WL_FILE_NAME_MAX]; |
273 | s8 nvram_name[WL_FILE_NAME_MAX]; | 273 | s8 nvram_name[WL_FILE_NAME_MAX]; |
@@ -316,7 +316,7 @@ struct wl_priv { | |||
316 | downloading */ | 316 | downloading */ |
317 | struct wl_pmk_list *pmk_list; /* wpa2 pmk list */ | 317 | struct wl_pmk_list *pmk_list; /* wpa2 pmk list */ |
318 | int32 event_pid; /* pid of main event handler thread */ | 318 | int32 event_pid; /* pid of main event handler thread */ |
319 | ulong status; /* current dongle status */ | 319 | unsigned long status; /* current dongle status */ |
320 | void *pub; | 320 | void *pub; |
321 | uint32 channel; /* current channel */ | 321 | uint32 channel; /* current channel */ |
322 | bool iscan_on; /* iscan on/off switch */ | 322 | bool iscan_on; /* iscan on/off switch */ |
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c index 6674006b581..db008515279 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c | |||
@@ -143,7 +143,7 @@ typedef struct iscan_info { | |||
143 | int iscan_ex_param_size; | 143 | int iscan_ex_param_size; |
144 | } iscan_info_t; | 144 | } iscan_info_t; |
145 | iscan_info_t *g_iscan = NULL; | 145 | iscan_info_t *g_iscan = NULL; |
146 | static void wl_iw_timerfunc(ulong data); | 146 | static void wl_iw_timerfunc(unsigned long data); |
147 | static void wl_iw_set_event_mask(struct net_device *dev); | 147 | static void wl_iw_set_event_mask(struct net_device *dev); |
148 | static int wl_iw_iscan(iscan_info_t *iscan, wlc_ssid_t *ssid, uint16 action); | 148 | static int wl_iw_iscan(iscan_info_t *iscan, wlc_ssid_t *ssid, uint16 action); |
149 | #endif /* defined(WL_IW_USE_ISCAN) */ | 149 | #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) | |||
1070 | return err; | 1070 | return err; |
1071 | } | 1071 | } |
1072 | 1072 | ||
1073 | static void wl_iw_timerfunc(ulong data) | 1073 | static void wl_iw_timerfunc(unsigned long data) |
1074 | { | 1074 | { |
1075 | iscan_info_t *iscan = (iscan_info_t *) data; | 1075 | iscan_info_t *iscan = (iscan_info_t *) data; |
1076 | if (iscan) { | 1076 | if (iscan) { |
@@ -3731,7 +3731,7 @@ int wl_iw_attach(struct net_device *dev, void *dhdp) | |||
3731 | 3731 | ||
3732 | iscan->timer_ms = 3000; | 3732 | iscan->timer_ms = 3000; |
3733 | init_timer(&iscan->timer); | 3733 | init_timer(&iscan->timer); |
3734 | iscan->timer.data = (ulong) iscan; | 3734 | iscan->timer.data = (unsigned long) iscan; |
3735 | iscan->timer.function = wl_iw_timerfunc; | 3735 | iscan->timer.function = wl_iw_timerfunc; |
3736 | 3736 | ||
3737 | sema_init(&iscan->sysioc_sem, 0); | 3737 | sema_init(&iscan->sysioc_sem, 0); |
diff --git a/drivers/staging/brcm80211/include/bcmutils.h b/drivers/staging/brcm80211/include/bcmutils.h index c1120c0a15f..cd519aafa45 100644 --- a/drivers/staging/brcm80211/include/bcmutils.h +++ b/drivers/staging/brcm80211/include/bcmutils.h | |||
@@ -207,13 +207,13 @@ extern "C" { | |||
207 | #ifdef BRCM_FULLMAC | 207 | #ifdef BRCM_FULLMAC |
208 | /* string */ | 208 | /* string */ |
209 | extern int BCMROMFN(bcm_atoi) (char *s); | 209 | extern int BCMROMFN(bcm_atoi) (char *s); |
210 | extern ulong BCMROMFN(bcm_strtoul) (char *cp, char **endp, uint base); | 210 | extern unsigned long BCMROMFN(bcm_strtoul) (char *cp, char **endp, uint base); |
211 | extern char *BCMROMFN(bcmstrstr) (char *haystack, char *needle); | 211 | extern char *BCMROMFN(bcmstrstr) (char *haystack, char *needle); |
212 | extern char *BCMROMFN(bcmstrcat) (char *dest, const char *src); | 212 | extern char *BCMROMFN(bcmstrcat) (char *dest, const char *src); |
213 | extern char *BCMROMFN(bcmstrncat) (char *dest, const char *src, | 213 | extern char *BCMROMFN(bcmstrncat) (char *dest, const char *src, |
214 | uint size); | 214 | uint size); |
215 | extern ulong wchar2ascii(char *abuf, unsigned short *wbuf, unsigned short wbuflen, | 215 | extern unsigned long wchar2ascii(char *abuf, unsigned short *wbuf, unsigned short wbuflen, |
216 | ulong abuflen); | 216 | unsigned long abuflen); |
217 | char *bcmstrtok(char **string, const char *delimiters, char *tokdelim); | 217 | char *bcmstrtok(char **string, const char *delimiters, char *tokdelim); |
218 | int bcmstricmp(const char *s1, const char *s2); | 218 | int bcmstricmp(const char *s1, const char *s2); |
219 | int bcmstrnicmp(const char *s1, const char *s2, int cnt); | 219 | int bcmstrnicmp(const char *s1, const char *s2, int cnt); |
diff --git a/drivers/staging/brcm80211/include/linux_osl.h b/drivers/staging/brcm80211/include/linux_osl.h index 21614d7eb10..d3662e31504 100644 --- a/drivers/staging/brcm80211/include/linux_osl.h +++ b/drivers/staging/brcm80211/include/linux_osl.h | |||
@@ -121,7 +121,7 @@ extern uint osl_malloc_failed(osl_t *osh); | |||
121 | #define DMA_CONSISTENT_ALIGN PAGE_SIZE | 121 | #define DMA_CONSISTENT_ALIGN PAGE_SIZE |
122 | #define DMA_ALLOC_CONSISTENT(osh, size, pap, dmah, alignbits) \ | 122 | #define DMA_ALLOC_CONSISTENT(osh, size, pap, dmah, alignbits) \ |
123 | osl_dma_alloc_consistent((osh), (size), (pap)) | 123 | osl_dma_alloc_consistent((osh), (size), (pap)) |
124 | extern void *osl_dma_alloc_consistent(osl_t *osh, uint size, ulong *pap); | 124 | extern void *osl_dma_alloc_consistent(osl_t *osh, uint size, unsigned long *pap); |
125 | #else | 125 | #else |
126 | /* allocate/free shared (dma-able) consistent memory */ | 126 | /* allocate/free shared (dma-able) consistent memory */ |
127 | #define DMA_CONSISTENT_ALIGN osl_dma_consistent_align() | 127 | #define DMA_CONSISTENT_ALIGN osl_dma_consistent_align() |
@@ -129,11 +129,11 @@ extern void *osl_dma_alloc_consistent(osl_t *osh, uint size, ulong *pap); | |||
129 | osl_dma_alloc_consistent((osh), (size), (align), (tot), (pap)) | 129 | osl_dma_alloc_consistent((osh), (size), (align), (tot), (pap)) |
130 | extern uint osl_dma_consistent_align(void); | 130 | extern uint osl_dma_consistent_align(void); |
131 | extern void *osl_dma_alloc_consistent(osl_t *osh, uint size, uint16 align, | 131 | extern void *osl_dma_alloc_consistent(osl_t *osh, uint size, uint16 align, |
132 | uint *tot, ulong *pap); | 132 | uint *tot, unsigned long *pap); |
133 | #endif | 133 | #endif |
134 | #define DMA_FREE_CONSISTENT(osh, va, size, pa, dmah) \ | 134 | #define DMA_FREE_CONSISTENT(osh, va, size, pa, dmah) \ |
135 | osl_dma_free_consistent((osh), (void *)(va), (size), (pa)) | 135 | osl_dma_free_consistent((osh), (void *)(va), (size), (pa)) |
136 | extern void osl_dma_free_consistent(osl_t *osh, void *va, uint size, ulong pa); | 136 | extern void osl_dma_free_consistent(osl_t *osh, void *va, uint size, unsigned long pa); |
137 | 137 | ||
138 | /* map/unmap direction */ | 138 | /* map/unmap direction */ |
139 | #define DMA_TX 1 /* TX direction for DMA */ | 139 | #define DMA_TX 1 /* TX direction for DMA */ |
diff --git a/drivers/staging/brcm80211/include/typedefs.h b/drivers/staging/brcm80211/include/typedefs.h index 911d134af36..076d95b8493 100644 --- a/drivers/staging/brcm80211/include/typedefs.h +++ b/drivers/staging/brcm80211/include/typedefs.h | |||
@@ -31,22 +31,17 @@ typedef unsigned long long int uintptr; | |||
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | #define TYPEDEF_UINT | 33 | #define TYPEDEF_UINT |
34 | #define TYPEDEF_ULONG | ||
35 | 34 | ||
36 | /* | 35 | /* |
37 | * Default Typedefs | 36 | * Default Typedefs |
38 | */ | 37 | */ |
39 | 38 | ||
40 | /* define ushort, uint, ulong */ | 39 | /* define uint */ |
41 | 40 | ||
42 | #ifndef TYPEDEF_UINT | 41 | #ifndef TYPEDEF_UINT |
43 | typedef unsigned int uint; | 42 | typedef unsigned int uint; |
44 | #endif | 43 | #endif |
45 | 44 | ||
46 | #ifndef TYPEDEF_ULONG | ||
47 | typedef unsigned long ulong; | ||
48 | #endif | ||
49 | |||
50 | /* define [u]int16/32/64, uintptr */ | 45 | /* define [u]int16/32/64, uintptr */ |
51 | 46 | ||
52 | #ifndef TYPEDEF_UINT16 | 47 | #ifndef TYPEDEF_UINT16 |
@@ -90,7 +85,6 @@ typedef signed int int32; | |||
90 | #define AUTO (-1) /* Auto = -1 */ | 85 | #define AUTO (-1) /* Auto = -1 */ |
91 | 86 | ||
92 | #undef TYPEDEF_UINT | 87 | #undef TYPEDEF_UINT |
93 | #undef TYPEDEF_ULONG | ||
94 | #undef TYPEDEF_UINT16 | 88 | #undef TYPEDEF_UINT16 |
95 | #undef TYPEDEF_UINT32 | 89 | #undef TYPEDEF_UINT32 |
96 | #undef TYPEDEF_UINTPTR | 90 | #undef TYPEDEF_UINTPTR |
diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c index 89f1816b67c..98d3e8466e3 100644 --- a/drivers/staging/brcm80211/sys/wl_mac80211.c +++ b/drivers/staging/brcm80211/sys/wl_mac80211.c | |||
@@ -69,7 +69,7 @@ void wlc_mac_bcn_promisc_change(wlc_info_t *wlc, bool promisc); | |||
69 | void wlc_set_addrmatch(wlc_info_t *wlc, int match_reg_offset, | 69 | void wlc_set_addrmatch(wlc_info_t *wlc, int match_reg_offset, |
70 | const struct ether_addr *addr); | 70 | const struct ether_addr *addr); |
71 | 71 | ||
72 | static void wl_timer(ulong data); | 72 | static void wl_timer(unsigned long data); |
73 | static void _wl_timer(wl_timer_t *t); | 73 | static void _wl_timer(wl_timer_t *t); |
74 | 74 | ||
75 | #ifdef WLC_HIGH_ONLY | 75 | #ifdef WLC_HIGH_ONLY |
@@ -144,7 +144,7 @@ static void wl_release_fw(wl_info_t *wl); | |||
144 | static int wl_start(struct sk_buff *skb, wl_info_t *wl); | 144 | static int wl_start(struct sk_buff *skb, wl_info_t *wl); |
145 | static int wl_start_int(wl_info_t *wl, struct ieee80211_hw *hw, | 145 | static int wl_start_int(wl_info_t *wl, struct ieee80211_hw *hw, |
146 | struct sk_buff *skb); | 146 | struct sk_buff *skb); |
147 | static void wl_dpc(ulong data); | 147 | static void wl_dpc(unsigned long data); |
148 | 148 | ||
149 | MODULE_AUTHOR("Broadcom Corporation"); | 149 | MODULE_AUTHOR("Broadcom Corporation"); |
150 | MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver."); | 150 | MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver."); |
@@ -764,14 +764,14 @@ static int wl_set_hint(wl_info_t *wl, char *abbrev) | |||
764 | * a warning that this function is defined but not used if we declare | 764 | * a warning that this function is defined but not used if we declare |
765 | * it as static. | 765 | * it as static. |
766 | */ | 766 | */ |
767 | static wl_info_t *wl_attach(uint16 vendor, uint16 device, ulong regs, | 767 | static wl_info_t *wl_attach(uint16 vendor, uint16 device, unsigned long regs, |
768 | uint bustype, void *btparam, uint irq) | 768 | uint bustype, void *btparam, uint irq) |
769 | { | 769 | { |
770 | wl_info_t *wl; | 770 | wl_info_t *wl; |
771 | osl_t *osh; | 771 | osl_t *osh; |
772 | int unit, err; | 772 | int unit, err; |
773 | 773 | ||
774 | ulong base_addr; | 774 | unsigned long base_addr; |
775 | struct ieee80211_hw *hw; | 775 | struct ieee80211_hw *hw; |
776 | u8 perm[ETH_ALEN]; | 776 | u8 perm[ETH_ALEN]; |
777 | 777 | ||
@@ -813,7 +813,7 @@ static wl_info_t *wl_attach(uint16 vendor, uint16 device, ulong regs, | |||
813 | atomic_set(&wl->callbacks, 0); | 813 | atomic_set(&wl->callbacks, 0); |
814 | 814 | ||
815 | /* setup the bottom half handler */ | 815 | /* setup the bottom half handler */ |
816 | tasklet_init(&wl->tasklet, wl_dpc, (ulong) wl); | 816 | tasklet_init(&wl->tasklet, wl_dpc, (unsigned long) wl); |
817 | 817 | ||
818 | #ifdef WLC_HIGH_ONLY | 818 | #ifdef WLC_HIGH_ONLY |
819 | wl->rpc_th = bcm_rpc_tp_attach(osh, NULL); | 819 | wl->rpc_th = bcm_rpc_tp_attach(osh, NULL); |
@@ -987,7 +987,7 @@ static void *wl_dbus_probe_cb(void *arg, const char *desc, uint32 bustype, | |||
987 | wl_info_t *wl; | 987 | wl_info_t *wl; |
988 | WL_ERROR(("%s:\n", __func__)); | 988 | WL_ERROR(("%s:\n", __func__)); |
989 | 989 | ||
990 | wl = wl_attach(BCM_DNGL_VID, BCM_DNGL_BDC_PID, (ulong) NULL, RPC_BUS, | 990 | wl = wl_attach(BCM_DNGL_VID, BCM_DNGL_BDC_PID, (unsigned long) NULL, RPC_BUS, |
991 | NULL, 0); | 991 | NULL, 0); |
992 | if (!wl) { | 992 | if (!wl) { |
993 | WL_ERROR(("%s: wl_attach failed\n", __func__)); | 993 | WL_ERROR(("%s: wl_attach failed\n", __func__)); |
@@ -1817,7 +1817,7 @@ irqreturn_t BCMFASTPATH wl_isr(int irq, void *dev_id) | |||
1817 | #endif /* WLC_LOW */ | 1817 | #endif /* WLC_LOW */ |
1818 | } | 1818 | } |
1819 | 1819 | ||
1820 | static void BCMFASTPATH wl_dpc(ulong data) | 1820 | static void BCMFASTPATH wl_dpc(unsigned long data) |
1821 | { | 1821 | { |
1822 | #ifdef WLC_LOW | 1822 | #ifdef WLC_LOW |
1823 | wl_info_t *wl; | 1823 | wl_info_t *wl; |
@@ -1882,7 +1882,7 @@ void wl_event(wl_info_t *wl, char *ifname, wlc_event_t *e) | |||
1882 | } | 1882 | } |
1883 | } | 1883 | } |
1884 | 1884 | ||
1885 | static void wl_timer(ulong data) | 1885 | static void wl_timer(unsigned long data) |
1886 | { | 1886 | { |
1887 | #ifndef WLC_HIGH_ONLY | 1887 | #ifndef WLC_HIGH_ONLY |
1888 | _wl_timer((wl_timer_t *) data); | 1888 | _wl_timer((wl_timer_t *) data); |
@@ -1927,7 +1927,7 @@ wl_timer_t *wl_init_timer(wl_info_t *wl, void (*fn) (void *arg), void *arg, | |||
1927 | bzero(t, sizeof(wl_timer_t)); | 1927 | bzero(t, sizeof(wl_timer_t)); |
1928 | 1928 | ||
1929 | init_timer(&t->timer); | 1929 | init_timer(&t->timer); |
1930 | t->timer.data = (ulong) t; | 1930 | t->timer.data = (unsigned long) t; |
1931 | t->timer.function = wl_timer; | 1931 | t->timer.function = wl_timer; |
1932 | t->wl = wl; | 1932 | t->wl = wl; |
1933 | t->fn = fn; | 1933 | t->fn = fn; |
@@ -2069,7 +2069,7 @@ static void wl_rpc_down(void *wlh) | |||
2069 | static int BCMFASTPATH wl_start(struct sk_buff *skb, wl_info_t *wl) | 2069 | static int BCMFASTPATH wl_start(struct sk_buff *skb, wl_info_t *wl) |
2070 | { | 2070 | { |
2071 | 2071 | ||
2072 | ulong flags; | 2072 | unsigned long flags; |
2073 | 2073 | ||
2074 | skb->prev = NULL; | 2074 | skb->prev = NULL; |
2075 | 2075 | ||
@@ -2103,7 +2103,7 @@ static void wl_start_txqwork(struct wl_task *task) | |||
2103 | { | 2103 | { |
2104 | wl_info_t *wl = (wl_info_t *) task->context; | 2104 | wl_info_t *wl = (wl_info_t *) task->context; |
2105 | struct sk_buff *skb; | 2105 | struct sk_buff *skb; |
2106 | ulong flags; | 2106 | unsigned long flags; |
2107 | uint count = 0; | 2107 | uint count = 0; |
2108 | 2108 | ||
2109 | WL_TRACE(("wl%d: wl_start_txqwork\n", wl->pub->unit)); | 2109 | WL_TRACE(("wl%d: wl_start_txqwork\n", wl->pub->unit)); |
@@ -2183,7 +2183,7 @@ static void wl_rpcq_dispatch(struct wl_task *task) | |||
2183 | { | 2183 | { |
2184 | wl_info_t *wl = (wl_info_t *) task->context; | 2184 | wl_info_t *wl = (wl_info_t *) task->context; |
2185 | rpc_buf_t *buf; | 2185 | rpc_buf_t *buf; |
2186 | ulong flags; | 2186 | unsigned long flags; |
2187 | 2187 | ||
2188 | /* First remove an entry then go for execution */ | 2188 | /* First remove an entry then go for execution */ |
2189 | RPCQ_LOCK(wl, flags); | 2189 | RPCQ_LOCK(wl, flags); |
@@ -2212,7 +2212,7 @@ static void wl_rpcq_dispatch(struct wl_task *task) | |||
2212 | 2212 | ||
2213 | static void wl_rpcq_add(wl_info_t *wl, rpc_buf_t *buf) | 2213 | static void wl_rpcq_add(wl_info_t *wl, rpc_buf_t *buf) |
2214 | { | 2214 | { |
2215 | ulong flags; | 2215 | unsigned long flags; |
2216 | 2216 | ||
2217 | bcm_rpc_buf_next_set(wl->rpc_th, buf, NULL); | 2217 | bcm_rpc_buf_next_set(wl->rpc_th, buf, NULL); |
2218 | 2218 | ||
diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.h b/drivers/staging/brcm80211/sys/wl_mac80211.h index 0a1cf2685fa..1618e918e0b 100644 --- a/drivers/staging/brcm80211/sys/wl_mac80211.h +++ b/drivers/staging/brcm80211/sys/wl_mac80211.h | |||
@@ -81,7 +81,7 @@ struct wl_info { | |||
81 | struct tasklet_struct tasklet; /* dpc tasklet */ | 81 | struct tasklet_struct tasklet; /* dpc tasklet */ |
82 | #ifdef BCMSDIO | 82 | #ifdef BCMSDIO |
83 | bcmsdh_info_t *sdh; /* pointer to sdio bus handler */ | 83 | bcmsdh_info_t *sdh; /* pointer to sdio bus handler */ |
84 | ulong flags; /* current irq flags */ | 84 | unsigned long flags; /* current irq flags */ |
85 | #endif /* BCMSDIO */ | 85 | #endif /* BCMSDIO */ |
86 | bool resched; /* dpc needs to be and is rescheduled */ | 86 | bool resched; /* dpc needs to be and is rescheduled */ |
87 | #ifdef LINUXSTA_PS | 87 | #ifdef LINUXSTA_PS |
diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c index 761be9d3a71..c7628965c0e 100644 --- a/drivers/staging/brcm80211/util/linux_osl.c +++ b/drivers/staging/brcm80211/util/linux_osl.c | |||
@@ -352,7 +352,7 @@ uint osl_dma_consistent_align(void) | |||
352 | } | 352 | } |
353 | 353 | ||
354 | void *osl_dma_alloc_consistent(osl_t *osh, uint size, uint16 align_bits, | 354 | void *osl_dma_alloc_consistent(osl_t *osh, uint size, uint16 align_bits, |
355 | uint *alloced, ulong *pap) | 355 | uint *alloced, unsigned long *pap) |
356 | { | 356 | { |
357 | uint16 align = (1 << align_bits); | 357 | uint16 align = (1 << align_bits); |
358 | ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); | 358 | ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); |
@@ -364,7 +364,7 @@ void *osl_dma_alloc_consistent(osl_t *osh, uint size, uint16 align_bits, | |||
364 | return pci_alloc_consistent(osh->pdev, size, (dma_addr_t *) pap); | 364 | return pci_alloc_consistent(osh->pdev, size, (dma_addr_t *) pap); |
365 | } | 365 | } |
366 | 366 | ||
367 | void osl_dma_free_consistent(osl_t *osh, void *va, uint size, ulong pa) | 367 | void osl_dma_free_consistent(osl_t *osh, void *va, uint size, unsigned long pa) |
368 | { | 368 | { |
369 | ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); | 369 | ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); |
370 | 370 | ||