diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 12:07:25 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 12:07:25 -0700 |
| commit | 95e326c28aa66d6ff5821f3c1d22b46a8d335939 (patch) | |
| tree | 0a147b3613d9586c2301b79013da15dc48177a0c /drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c | |
| parent | 26a6b2e1688bc154a16778851d710e90b62f715e (diff) | |
| download | linux-3.10-95e326c28aa66d6ff5821f3c1d22b46a8d335939.tar.gz linux-3.10-95e326c28aa66d6ff5821f3c1d22b46a8d335939.tar.bz2 linux-3.10-95e326c28aa66d6ff5821f3c1d22b46a8d335939.zip | |
staging: csr: remove CsrInt32 typedef
Use the in-kernel s32 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_mem.c')
| -rw-r--r-- | drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c b/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c index 0454f435a68..17867f60df1 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c @@ -603,7 +603,7 @@ static CsrResult unifi_read_directn_match(card_t *card, u32 addr, void *pdata, u addr += 2; } - *num = (CsrInt32)(cptr - (u8 *)pdata); + *num = (s32)(cptr - (u8 *)pdata); return CSR_RESULT_SUCCESS; } @@ -747,7 +747,7 @@ static CsrResult set_dmem_page(card_t *card, u32 dmem_addr, u32 *paddr) card->dmem_page = page; } - *paddr = ((CsrInt32)addr * 2) + (dmem_addr & 1); + *paddr = ((s32)addr * 2) + (dmem_addr & 1); return CSR_RESULT_SUCCESS; } /* set_dmem_page() */ @@ -787,7 +787,7 @@ static CsrResult set_pmem_page(card_t *card, u32 pmem_addr, card->pmem_page = page; } - *paddr = ((CsrInt32)addr * 2) + (pmem_addr & 1); + *paddr = ((s32)addr * 2) + (pmem_addr & 1); return CSR_RESULT_SUCCESS; } /* set_pmem_page() */ @@ -816,7 +816,7 @@ static CsrResult set_pmem_page(card_t *card, u32 pmem_addr, */ static CsrResult set_page(card_t *card, u32 generic_addr, u32 *paddr) { - CsrInt32 space; + s32 space; u32 addr; CsrResult r = CSR_RESULT_SUCCESS; @@ -1323,7 +1323,7 @@ CsrResult unifi_readnz(card_t *card, u32 unifi_addr, void *pdata, u16 len) * Value read from memory (0-127) or -1 on error * --------------------------------------------------------------------------- */ -CsrInt32 unifi_read_shared_count(card_t *card, u32 addr) +s32 unifi_read_shared_count(card_t *card, u32 addr) { u8 b; /* I've increased this count, because I have seen cases where @@ -1332,7 +1332,7 @@ CsrInt32 unifi_read_shared_count(card_t *card, u32 addr) * with increasing this limit. It's better to take a while to * recover than to fail. */ #define SHARED_READ_RETRY_LIMIT 10 - CsrInt32 i; + s32 i; /* * Get the to-host-signals-written count. @@ -1355,7 +1355,7 @@ CsrInt32 unifi_read_shared_count(card_t *card, u32 addr) * This avoids a race between driver read and firmware write of the * word, the value we need is in the lower 8 bits anway. */ - return (CsrInt32)(b & 0xff); + return (s32)(b & 0xff); } } |