mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
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>
This commit is contained in:
parent
d4fda8db97
commit
3c0b461e4c
2 changed files with 2 additions and 7 deletions
|
@ -26,11 +26,6 @@ extern "C" {
|
||||||
#undef TRUE
|
#undef TRUE
|
||||||
#define TRUE (1)
|
#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
|
* 64-bit integers
|
||||||
*
|
*
|
||||||
|
|
|
@ -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
|
/* 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 */
|
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);
|
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
|
#ifdef CSR_WIFI_ALIGNMENT_WORKAROUND
|
||||||
/* moving this check before we clear host data slot */
|
/* 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);
|
CsrMemFreeDma(host_bulk_data_slot);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue