aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-20 15:05:42 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-20 15:05:42 -0400
commit26a6b2e1688bc154a16778851d710e90b62f715e (patch)
tree556fe1919c94aa4d4bac68d3e5dfbc40cfdeec10 /drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c
parentab2b8c7383caf6b071930e4e1d4a8b4bf1708f38 (diff)
staging: csr: remove CsrUint32 typedef
Use the in-kernel u32 type instead. Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com> Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com> Cc: Riku Mettälä <riku.mettala@bluegiga.com> Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c')
-rw-r--r--drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c b/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c
index 1d09b974851..9c9e9070f6b 100644
--- a/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c
+++ b/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c
@@ -212,7 +212,7 @@ CsrResult prealloc_netdata_alloc(card_t *card)
212} 212}
213 213
214 214
215static CsrResult prealloc_netdata_get(card_t *card, bulk_data_desc_t *bulk_data_slot, CsrUint32 size) 215static CsrResult prealloc_netdata_get(card_t *card, bulk_data_desc_t *bulk_data_slot, u32 size)
216{ 216{
217 CsrResult r; 217 CsrResult r;
218 218
@@ -354,7 +354,7 @@ CsrResult unifi_force_low_power_mode(card_t *card)
354 * CSR_RESULT_SUCCESS on success or a CSR error code. 354 * CSR_RESULT_SUCCESS on success or a CSR error code.
355 * --------------------------------------------------------------------------- 355 * ---------------------------------------------------------------------------
356 */ 356 */
357CsrResult unifi_bh(card_t *card, CsrUint32 *remaining) 357CsrResult unifi_bh(card_t *card, u32 *remaining)
358{ 358{
359 CsrResult r; 359 CsrResult r;
360 CsrResult csrResult; 360 CsrResult csrResult;
@@ -1315,7 +1315,7 @@ static CsrResult process_to_host_signals(card_t *card, CsrInt32 *processed)
1315 if (GET_SIGNAL_ID(bufptr + 2) == CSR_MA_PACKET_CONFIRM_ID) 1315 if (GET_SIGNAL_ID(bufptr + 2) == CSR_MA_PACKET_CONFIRM_ID)
1316 { 1316 {
1317 /* Get host tag and transmission status */ 1317 /* Get host tag and transmission status */
1318 CsrUint32 host_tag = GET_PACKED_MA_PACKET_CONFIRM_HOST_TAG(bufptr + 2); 1318 u32 host_tag = GET_PACKED_MA_PACKET_CONFIRM_HOST_TAG(bufptr + 2);
1319 u16 status = GET_PACKED_MA_PACKET_CONFIRM_TRANSMISSION_STATUS(bufptr + 2); 1319 u16 status = GET_PACKED_MA_PACKET_CONFIRM_TRANSMISSION_STATUS(bufptr + 2);
1320 1320
1321 unifi_trace(card->ospriv, UDBG4, "process_to_host_signals signal ID=%x host Tag=%x status=%x\n", 1321 unifi_trace(card->ospriv, UDBG4, "process_to_host_signals signal ID=%x host Tag=%x status=%x\n",
@@ -1841,8 +1841,8 @@ static CsrResult process_bulk_data_command(card_t *card, const u8 *cmdptr,
1841 */ 1841 */
1842static CsrResult check_fh_sig_slots(card_t *card, u16 needed, CsrInt32 *space_fh) 1842static CsrResult check_fh_sig_slots(card_t *card, u16 needed, CsrInt32 *space_fh)
1843{ 1843{
1844 CsrUint32 count_fhw; 1844 u32 count_fhw;
1845 CsrUint32 occupied_fh, slots_fh; 1845 u32 occupied_fh, slots_fh;
1846 CsrInt32 count_fhr; 1846 CsrInt32 count_fhr;
1847 1847
1848 count_fhw = card->from_host_signals_w; 1848 count_fhw = card->from_host_signals_w;
@@ -2180,7 +2180,7 @@ static CsrResult process_fh_traffic_queue(card_t *card, CsrInt32 *processed)
2180 u16 needed_chunks; 2180 u16 needed_chunks;
2181 CsrInt32 space_chunks; 2181 CsrInt32 space_chunks;
2182 u16 q_index; 2182 u16 q_index;
2183 CsrUint32 host_tag = 0; 2183 u32 host_tag = 0;
2184 u16 slot_num = 0; 2184 u16 slot_num = 0;
2185 2185
2186 *processed = 0; 2186 *processed = 0;