diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 12:35:14 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 12:35:14 -0700 |
| commit | 3c0b461e4c8fde467bd803e368d9a78ec2da5f8a (patch) | |
| tree | 59406d8eac57f40ab446f0eee691e3e00bc7f1b6 /drivers/staging | |
| parent | d4fda8db9796271ddd306583e1afa9df23ae1558 (diff) | |
| download | linux-3.10-3c0b461e4c8fde467bd803e368d9a78ec2da5f8a.tar.gz linux-3.10-3c0b461e4c8fde467bd803e368d9a78ec2da5f8a.tar.bz2 linux-3.10-3c0b461e4c8fde467bd803e368d9a78ec2da5f8a.zip | |
staging: csr: remove odd pointer typedefs
No one was using CsrPtrdiff or CsrUintptr, but CsrIntptr is used in one
place, so replace that with ptrdiff_t. Odds are all it really wants is
a void * there, but hey, I'll play along for now.
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')
| -rw-r--r-- | drivers/staging/csr/csr_types.h | 5 | ||||
| -rw-r--r-- | drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/csr/csr_types.h b/drivers/staging/csr/csr_types.h index fb0f07cc4e5..76f95615033 100644 --- a/drivers/staging/csr/csr_types.h +++ b/drivers/staging/csr/csr_types.h @@ -26,11 +26,6 @@ extern "C" { #undef TRUE #define TRUE (1) -/* Basic types */ -typedef ptrdiff_t CsrPtrdiff; /* Type of the result of subtracting two pointers (ISO/IEC 9899:1990 7.1.6) */ -typedef uintptr_t CsrUintptr; /* Unsigned integer large enough to hold any pointer (ISO/IEC 9899:1999 7.18.1.4) */ -typedef ptrdiff_t CsrIntptr; /* intptr_t is not defined in kernel. Use the equivalent ptrdiff_t. */ - /* * 64-bit integers * 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 8aba8281886..9f2343c2f46 100644 --- a/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c +++ b/drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c @@ -1740,7 +1740,7 @@ static CsrResult process_bulk_data_command(card_t *card, const u8 *cmdptr, /* if os_data_ptr is not 4-byte aligned, then allocate a new buffer and copy data to new buffer to ensure the address passed to unifi_bulk_rw is 4-byte aligned */ - if (len != 0 && (dir == UNIFI_SDIO_WRITE) && (((CsrIntptr)bdslot->os_data_ptr + offset) & 3)) + if (len != 0 && (dir == UNIFI_SDIO_WRITE) && (((ptrdiff_t)bdslot->os_data_ptr + offset) & 3)) { host_bulk_data_slot = CsrMemAllocDma(len); @@ -1799,7 +1799,7 @@ static CsrResult process_bulk_data_command(card_t *card, const u8 *cmdptr, #ifdef CSR_WIFI_ALIGNMENT_WORKAROUND /* moving this check before we clear host data slot */ - if ((len != 0) && (dir == UNIFI_SDIO_WRITE) && (((CsrIntptr)bdslot->os_data_ptr + offset) & 3)) + if ((len != 0) && (dir == UNIFI_SDIO_WRITE) && (((ptrdiff_t)bdslot->os_data_ptr + offset) & 3)) { CsrMemFreeDma(host_bulk_data_slot); } |