Skip to content

Commit

Permalink
staging: csr: remove odd pointer typedefs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Jul 20, 2012
1 parent d4fda8d commit 3c0b461
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
5 changes: 0 additions & 5 deletions drivers/staging/csr/csr_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit 3c0b461

Please sign in to comment.