---

yaml
---
r: 318159
b: refs/heads/master
c: 3c0b461
h: refs/heads/master
i:
  318157: 157c38f
  318155: 4acda4b
  318151: 516a5ff
  318143: 5f29ab2
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4fda8db9796271ddd306583e1afa9df23ae1558
+refs/heads/master: 3c0b461e4c8fde467bd803e368d9a78ec2da5f8a

trunk/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
  *

trunk/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);
         }